Add the rest of the stuff for named pipe comms, including feedback information, and...

[user/henk/code/inspircd.git] / src / commands / cmd_stats.cpp

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 9da5f1aeba8204a4f3fa8d31eeb455c7239081db..1296bf08a5ff337c800b645be1263a72ad53aff4 100644 (file)
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -163,7 +163,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 
                /* stats m (list number of times each command has been used, plus bytecount) */
                case 'm':
-                       for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+                       for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
                        {
                                if (i->second->use_count)
                                {
@@ -227,6 +227,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                                snprintf(percent, 30, "%03.5f%%", per);
                                results.push_back(sn+" 249 "+user->nick+" :CPU Usage: "+percent);
                        }
+#else
+                       PROCESS_MEMORY_COUNTERS MemCounters;
+                       if (GetProcessMemoryInfo(GetCurrentProcess(), &MemCounters, sizeof(MemCounters)))
+                       {
+                               results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr((MemCounters.WorkingSetSize + MemCounters.PagefileUsage) / 1024)+"K");
+                               results.push_back(sn+" 249 "+user->nick+" :Pagefile usage:   "+ConvToStr(MemCounters.PagefileUsage / 1024)+"K");
+                               results.push_back(sn+" 249 "+user->nick+" :Page faults:      "+ConvToStr(MemCounters.PageFaultCount));
+                       }
 #endif
                }
                break;
@@ -264,10 +272,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
                        {
                                User* i = *n;
-                               if (ServerInstance->IsNick(i->nick.c_str()))
-                               {
-                                       results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
-                               }
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
                        }
                break;
 
@@ -277,10 +282,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
                        {
                                User* i = *n;
-                               if (ServerInstance->IsNick(i->nick.c_str()))
-                               {
-                                       results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
-                               }
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
                        }
                break;