\r
IPCThread::IPCThread(InspIRCd* Instance) : Thread(), ServerInstance(Instance)\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
{\r
LPTSTR Pipename = "\\\\.\\pipe\\InspIRCdStatus";\r
\r
- while (GetExitFlag() == false)
+ 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
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
}\r
\r
\r
-IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)
-{
- /* The IPC pipe is threaded */
- thread = new IPCThread(Srv);
- Srv->Threads->Create(thread);
-}
-
-void IPC::Check()
-{
- switch (thread->GetStatus())
- {
- case 'N':
- /* No-Operation */
- thread->SetResult(0);
- thread->ClearStatus();
- break;
- case '1':
- /* Rehash */
- ServerInstance->Rehash("due to rehash command from GUI");
- thread->SetResult(0);
- thread->ClearStatus();
- break;
- case '2':
- /* Shutdown */
- thread->SetResult(0);
- thread->ClearStatus();
- ServerInstance->Exit(EXIT_STATUS_NOERROR);
- break;
- case '3':
- /* Restart */
- thread->SetResult(0);
- thread->ClearStatus();
- ServerInstance->Restart("Restarting due to command from GUI");
- break;
- }
-}
-
-IPC::~IPC()
-{
- thread->SetExitFlag();
- delete thread;
-}
\ No newline at end of file
+IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)\r
+{\r
+ /* The IPC pipe is threaded */\r
+ thread = new IPCThread(Srv);\r
+ Srv->Threads->Start(thread);\r
+}\r
+\r
+void IPC::Check()\r
+{\r
+ switch (thread->GetStatus())\r
+ {\r
+ case 'N':\r
+ /* No-Operation */\r
+ thread->SetResult(0);\r
+ thread->ClearStatus();\r
+ break;\r
+ case '1':\r
+ /* Rehash */\r
+ ServerInstance->Rehash("due to rehash command from GUI");\r
+ thread->SetResult(0);\r
+ thread->ClearStatus();\r
+ break;\r
+ case '2':\r
+ /* Shutdown */\r
+ thread->SetResult(0);\r
+ thread->ClearStatus();\r
+ ServerInstance->Exit(EXIT_STATUS_NOERROR);\r
+ break;\r
+ case '3':\r
+ /* Restart */\r
+ thread->SetResult(0);\r
+ 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
+IPC::~IPC()\r
+{\r
+ thread->SetExitFlag();\r
+ delete thread;\r
+}\r