Changeset 34f5502 in nscp for trunk/modules/CheckSystem/PDHCollector.cpp

Timestamp:

02/18/08 23:21:23 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

087a3c9

Parents:

e0936e3

Message:

+ Added propper output handling to process subsystem (now you can execute programs tat return "much" data.

+ Added select support for SSL_write (now you can send "any amount of data" to the (SSL) socket.

Since check_nrpe doesn't do this it wont work in that end, but still...

File:

• trunk/modules/CheckSystem/PDHCollector.cpp (modified) (8 diffs)

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -159 +159 @@
   bool bInit = true;
 
-  if (!loadCounter(pdh)) {
-    pdh.removeAllCounters();
-    NSC_DEBUG_MSG_STD(_T("We aparently failed to load counters trying to use default (English) counters or those configured in nsc.ini"));
-    SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT));
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT), &memCmt);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT), &upTime);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT), &cpu);
-    try {
-      pdh.open();
-    } catch (const PDH::PDHException &e) {
-      NSC_LOG_ERROR_STD(_T("Failed to open performance counters: ") + e.getError());
+  {
+    WriteLock lock(&mutex_, true, 5000);
+    if (!lock.IsLocked()) {
+      NSC_LOG_ERROR_STD(_T("Failed to get mutex when trying to start thread... thread will now die..."));
       bInit = false;
+    } else if (!loadCounter(pdh)) {
+      pdh.removeAllCounters();
+      NSC_DEBUG_MSG_STD(_T("We aparently failed to load counters trying to use default (English) counters or those configured in nsc.ini"));
+      SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT));
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT), &memCmt);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT), &upTime);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT), &cpu);
+      try {
+        pdh.open();
+      } catch (const PDH::PDHException &e) {
+        NSC_LOG_ERROR_STD(_T("Failed to open performance counters: ") + e.getError());
+        bInit = false;
+      }
     }
   }
@@ -181 +187 @@
       std::list<std::wstring> errors;
       {
-        MutexLock mutex(mutexHandler);
-        if (!mutex.hasMutex()) 
+        ReadLock lock(&mutex_, true, 5000);
+        if (!lock.IsLocked()) 
           NSC_LOG_ERROR(_T("Failed to get Mutex!"));
         else {
@@ -210 +216 @@
 
   {
-    MutexLock mutex(mutexHandler);
-    if (!mutex.hasMutex()) {
+    WriteLock lock(&mutex_, true, 5000);
+    if (!lock.IsLocked()) {
       NSC_LOG_ERROR(_T("Failed to get Mute when closing thread!"));
     }
@@ -235 +241 @@
   if (hStopEvent_ == NULL)
     NSC_LOG_ERROR(_T("Stop event is not created!"));
-  else
-    if (!SetEvent(hStopEvent_)) {
+  else if (!SetEvent(hStopEvent_)) {
       NSC_LOG_ERROR_STD(_T("SetStopEvent failed"));
-    }
+  }
 }
 /**
@@ -247 +252 @@
 int PDHCollector::getCPUAvrage(std::wstring time) {
   unsigned int mseconds = strEx::stoui_as_time(time, checkIntervall_*100);
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
   }
-  return static_cast<int>(cpu.getAvrage(mseconds / (checkIntervall_*100)));
+  try {
+    return static_cast<int>(cpu.getAvrage(mseconds / (checkIntervall_*100)));
+  } catch (PDHCollectors::PDHException &e) {
+    NSC_LOG_ERROR(_T("Failed to get (sub) Mutex!"));
+    return -1;
+  }
 }
 /**
@@ -261 +271 @@
 */
 long long PDHCollector::getUptime() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
@@ -273 +283 @@
 */
 unsigned long long PDHCollector::getMemCommitLimit() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
@@ -286 +296 @@
 */
 unsigned long long PDHCollector::getMemCommit() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;