Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / win / inspircd_namedpipe.cpp

diff --git a/win/inspircd_namedpipe.cpp b/win/inspircd_namedpipe.cpp
index d51172c05cd913da5610178a85e8debbe8048341..95c0ae5783fc204a41b234d4ad9b6f174906186a 100644 (file)
--- a/win/inspircd_namedpipe.cpp
+++ b/win/inspircd_namedpipe.cpp
@@ -6,13 +6,15 @@
 #include <psapi.h>\r
 \r
 \r
-IPCThread::IPCThread(InspIRCd* Instance) : Thread(), ServerInstance(Instance)\r
+IPCThread::IPCThread()\r
 {\r
+       if (!initwmi())\r
+               ServerInstance->Logs->Log("IPC", DEBUG, "Could not initialise WMI. CPU percantage reports will not be available.");\r
 }\r
 \r
 IPCThread::~IPCThread()\r
 {\r
-\r
+       donewmi();\r
 }\r
 \r
 void IPCThread::Run()\r
@@ -22,19 +24,19 @@ void IPCThread::Run()
        while (GetExitFlag() == false)\r
        {\r
                Pipe = CreateNamedPipe (Pipename,\r
-                                          PIPE_ACCESS_DUPLEX, // read/write access\r
-                                          PIPE_TYPE_MESSAGE | // message type pipe\r
-                                          PIPE_READMODE_MESSAGE | // message-read mode\r
-                                          PIPE_WAIT, // blocking mode\r
-                                          PIPE_UNLIMITED_INSTANCES, // max. instances\r
-                                          MAXBUF, // output buffer size\r
-                                          MAXBUF, // input buffer size\r
-                                          1000, // client time-out\r
-                                          NULL); // no security attribute\r
+                                       PIPE_ACCESS_DUPLEX, // read/write access\r
+                                       PIPE_TYPE_MESSAGE | // message type pipe\r
+                                       PIPE_READMODE_MESSAGE | // message-read mode\r
+                                       PIPE_WAIT, // blocking mode\r
+                                       PIPE_UNLIMITED_INSTANCES, // max. instances\r
+                                       MAXBUF, // output buffer size\r
+                                       MAXBUF, // input buffer size\r
+                                       1000, // client time-out\r
+                                       NULL); // no security attribute\r
 \r
                if (Pipe == INVALID_HANDLE_VALUE)\r
                {\r
-                       SleepEx(500, true);\r
+                       SleepEx(10, true);\r
                        continue;\r
                }\r
 \r
@@ -83,6 +85,8 @@ void IPCThread::Run()
                        stat << "kbitspersectotal " << kbitpersec_total << std::endl;\r
                        stat << "kbitspersecout " << kbitpersec_out << std::endl;\r
                        stat << "kbitspersecin " << kbitpersec_in << std::endl;\r
+                       stat << "uptime " << ServerInstance->Time() - ServerInstance->startup_time << std::endl;\r
+                       stat << "cpu " << getcpu() << std::endl;\r
                        if (HaveMemoryStats)\r
                        {\r
                                stat << "workingset " << MemCounters.WorkingSetSize << std::endl;\r
@@ -123,11 +127,11 @@ void IPCThread::SetResult(int newresult)
 }\r
 \r
 \r
-IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)\r
+IPC::IPC()\r
 {\r
        /* The IPC pipe is threaded */\r
        thread = new IPCThread(Srv);\r
-       Srv->Threads->Create(thread);\r
+       Srv->Threads->Start(thread);\r
 }\r
 \r
 void IPC::Check()\r
@@ -157,6 +161,12 @@ void IPC::Check()
                        thread->ClearStatus();\r
                        ServerInstance->Restart("Restarting due to command from GUI");\r
                break;\r
+               case '4':\r
+                       /* Toggle debug */\r
+                       thread->SetResult(0);\r
+                       thread->ClearStatus();\r
+                       ServerInstance->Config->forcedebug = !ServerInstance->Config->forcedebug;\r
+               break;\r
        }\r
 }\r
 \r
@@ -164,4 +174,4 @@ IPC::~IPC()
 {\r
        thread->SetExitFlag();\r
        delete thread;\r
-}
\ No newline at end of file
+}\r