Changeset 3b8eb61 in nscp for trunk/include

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

Location:

trunk/include

Files:

• EnumProcess.cpp (modified) (1 diff)
• MutexRW.h (added)
• PDHCounter.h (modified) (2 diffs)

trunk/include/EnumProcess.cpp

@@ -5 +5 @@
 #include "stdafx.h"
 #include "EnumProcess.h"
-
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
 
 //////////////////////////////////////////////////////////////////////

trunk/include/PDHCounter.h

@@ -50 +50 @@
       PDH_STATUS status;
       assert(hQuery != NULL);
-      assert(hCounter_ == NULL);
+      if (hCounter_ != NULL)
+        throw PDHException("addToQuery failed (already opened): " + name_);
       if (listener_)
         listener_->attach(*this);
       if ((status = PdhAddCounter(hQuery, name_.c_str(), 0, &hCounter_)) != ERROR_SUCCESS) 
-        throw PDHException("PdhOpenQuery failed", status);
+        throw PDHException("PdhOpenQuery failed: " + name_, status);
       assert(hCounter_ != NULL);
     }
     void remove() {
-      assert(hCounter_ != NULL);
+      if (hCounter_ == NULL)
+        return;
       PDH_STATUS status;
       if (listener_)
@@ -67 +69 @@
     }
     void collect() {
-      assert(hCounter_ != NULL);
+      if (hCounter_ == NULL)
+        return;
       PDH_STATUS status;
       if ((status = PdhGetFormattedCounterValue(hCounter_, PDH_FMT_LARGE , NULL, &data_)) != ERROR_SUCCESS)