X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_stats.cpp;h=037ffe304ceccb9154f550075859535706de6dec;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=5c047f89ba06d6ed8d6fc9d6f195da2b80abf90f;hpb=04e35b16d86dd0115b3bcd0749398ec957cf0700;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 5c047f89b..037ffe304 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -15,6 +15,12 @@
 #include "configreader.h"
 #ifndef WIN32
 #include <sys/resource.h>
+
+/* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */
+#ifndef RUSAGE_SELF
+#define RUSAGE_SELF 0
+#endif
+
 #endif
 #include "users.h"
 #include "modules.h"
@@ -61,24 +67,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 		/* stats p (show listening ports and registered clients on each) */
 		case 'p':
 		{
-			std::map<int,int> pc;
-			for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
-			{
-				userrec* t = (userrec*)(*i);
-				if (t->registered == REG_ALL)
-					pc[t->GetPort()]++;
-			}
 			for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
 			{
-				if (pc[ServerInstance->Config->ports[i]->GetPort()] >= 0)
-				{
-					std::string ip = ServerInstance->Config->ports[i]->GetIP();
-					if (ip.empty())
-						ip = "*";
-					results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (" +
-							ConvToStr(pc[ServerInstance->Config->ports[i]->GetPort()])+" client" + (pc[ServerInstance->Config->ports[i]->GetPort()] != 1 ? "s" : "") + "), "+
-							ServerInstance->Config->ports[i]->GetDescription());
-				}
+				std::string ip = ServerInstance->Config->ports[i]->GetIP();
+				if (ip.empty())
+					ip = "*";
+
+				results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (client, " +
+						ServerInstance->Config->ports[i]->GetDescription() + ")");
 			}
 		}
 		break;
@@ -175,20 +171,11 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 		/* stats z (debug and memory info) */
 		case 'z':
 		{
-#ifndef WIN32
-			rusage R;
-			results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
-			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes, "+ConvToStr(ServerInstance->clientlist->bucket_count())+" buckets)");
-			results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes, "+ConvToStr(ServerInstance->chanlist->bucket_count())+" buckets)");
-			results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
-#else
 			results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
 			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
-#endif
 
-#ifndef WIN32
 			if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
 			{
 				command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
@@ -200,20 +187,25 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 					whowas_command->HandleInternal(WHOWAS_STATS, params);
 					if (whowas_stats.GetExt("stats"))
 					{
-						char* stats = NULL;
+						char* stats;
 						whowas_stats.GetExt("stats", stats);
 						results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(stats));
 					}
 				}
 			}
-#endif
 
 			results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
 			results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->modules.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+" bytes)");
 
 #ifndef WIN32
-			if (!getrusage(0,&R))	/* RUSAGE_SELF */
+			/* Moved this down here so all the not-windows stuff (look w00tie, I didn't say win32!) is in one ifndef.
+			 * Also cuts out some identical code in both branches of the ifndef. -- Om
+			 */
+			rusage R;
+
+			/* Not sure why we were doing '0' with a RUSAGE_SELF comment rather than just using RUSAGE_SELF -- Om */
+			if (!getrusage(RUSAGE_SELF,&R))	/* RUSAGE_SELF */
 			{
 				results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
 				results.push_back(sn+" 249 "+user->nick+" :Signals:          "+ConvToStr(R.ru_nsignals));