Changeset e93e741 in nscp for trunk/modules/CheckSystem

Timestamp:

05/29/05 20:58:08 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

24f7192

Parents:

7da80b5

Message:

• Fixed PROCSTATE and SERVICESTATE return state. + Added support for individual size in CheckDriveSize and CheckFileSize (size has to be specified before a drive/path)
• Fixed performance data for drives (and possibly other places)

Location:

trunk/modules/CheckSystem

Files:

• CheckSystem.cpp (modified) (3 diffs)
• PDHCollector.cpp (modified) (2 diffs)
• PDHCollector.h (modified) (1 diff)

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -593 +593 @@
     try {
       PDH::PDHQuery pdh;
-      PDHCollectors::StaticPDHCounterListenerInt counter;
+      PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> counter;
       std::string name = (*it).first;
       if (name.empty())
@@ -601 +601 @@
       pdh.collect();
       if (bNSCLientCompatible) {
-//        std::cout << counter.getValue() << std::endl;
         msg += strEx::itos(counter.getValue());
       } else {
@@ -632 +631 @@
   if (msg.empty())
     msg = "OK all counters within bounds.";
-  else
+  else if (!bNSCLientCompatible)
     msg = NSCHelper::translateReturn(returnCode) + ": " + msg;
   return returnCode;

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -50 +50 @@
 */
 DWORD PDHCollector::threadProc(LPVOID lpParameter) {
+  hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (!hStopEvent_) {
+    NSC_LOG_ERROR_STD("Create StopEvent failed: " + strEx::itos(GetLastError()));
+    return 0;
+  }
   PDH::PDHQuery pdh;
   pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
@@ -63 +68 @@
   }
 
-  hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
-  if (!hStopEvent_) {
-    NSC_LOG_ERROR_STD("Create StopEvent failed: " + strEx::itos(GetLastError()));
-    return 0;
-  }
 
   do {

trunk/modules/CheckSystem/PDHCollector.h

@@ -30 +30 @@
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListenerInt memCmtLim;
-  PDHCollectors::StaticPDHCounterListenerInt memCmt;
-  PDHCollectors::StaticPDHCounterListenerInt upTime;
-  PDHCollectors::RoundINTPDHBufferListener cpu;
+  PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> memCmtLim;
+  PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> memCmt;
+  PDHCollectors::StaticPDHCounterListener<__int64, PDH_FMT_LARGE> upTime;
+  PDHCollectors::RoundINTPDHBufferListener<__int64, PDH_FMT_LARGE> cpu;
 
 public: