Changeset 3b8eb61 in nscp for trunk/modules/CheckSystem/PDHCollector.cpp

Timestamp:

05/18/05 22:46:09 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

7da80b5

Parents:

f896cfb

Message:

2005-05-18 MickeM

• Fixed bug in NSC.ini (section title for Check System was wrong) + Added multitasking for plugins (now two plugins can handle requests simultaniously)
• Fixed som minor issues here and there

File:

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

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -82 +82 @@
   }while (!(WaitForSingleObject(hStopEvent_, checkIntervall_*100) == WAIT_OBJECT_0));
 
-  if (!CloseHandle(hStopEvent_))
-    NSC_LOG_ERROR_STD("Failed to close stopEvent handle: " + strEx::itos(GetLastError()));
-  else
-    hStopEvent_ = NULL;
-  try {
-    pdh.close();
-  } catch (const PDH::PDHException &e) {
-    NSC_LOG_ERROR_STD("Failed to close performance counters: " + e.str_);
+  {
+    MutexLock mutex(mutexHandler);
+    if (!mutex.hasMutex()) {
+      NSC_LOG_ERROR("Failed to get Mute when closing thread!");
+    }
+
+    if (!CloseHandle(hStopEvent_))
+      NSC_LOG_ERROR_STD("Failed to close stopEvent handle: " + strEx::itos(GetLastError()));
+    else
+      hStopEvent_ = NULL;
+    try {
+      pdh.close();
+    } catch (const PDH::PDHException &e) {
+      NSC_LOG_ERROR_STD("Failed to close performance counters: " + e.str_);
+    }
   }
   return 0;
@@ -99 +106 @@
  */
 void PDHCollector::exitThread(void) {
+  MutexLock mutex(mutexHandler);
+  if (!mutex.hasMutex()) {
+    NSC_LOG_ERROR("Failed to get Mute when trying to close thread!");
+    return;
+  }
   if (hStopEvent_ == NULL)
-    NSC_LOG_ERROR("Failed to get Mutex!");
+    NSC_LOG_ERROR("Failed to get stop event!");
   else
     if (!SetEvent(hStopEvent_)) {