Changeset ed754fe in nscp for trunk/modules/CheckSystem

Timestamp:

12/11/07 21:34:14 (6 years ago)

Author:

Michael Medin <michael@…>

Children:

306c51b

Parents:

69a5c54

Message:

2007-12-11 MickeM

+ Added support for index-lookups of PDH counters (hopefully *all* local problems are now fixed (yeah right))

2007-12-10 MickeM

+ Added intial draft for LUA module

File:

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

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -66 +66 @@
     settings.setFile(NSCModuleHelper::getBasePath(),  _T("counters.defs"), true);
     std::wstring section = NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_FORCE_LANGUAGE, C_SYSTEM_FORCE_LANGUAGE_DEFAULT);
+    bool bUseIndex = false;
 
     try {
@@ -79 +80 @@
         NSC_DEBUG_MSG_STD(_T("Autodetected NT4, using NT4 PDH counters."));
         prefix = _T("NT4");
+        bUseIndex = false;
         langId = systemInfo::GetSystemDefaultLangID();
       } else if (systemInfo::isAboveW2K(osVer)) {
         NSC_DEBUG_MSG_STD(_T("Autodetected w2k or later, using w2k PDH counters."));
+        bUseIndex = true;
         prefix = _T("W2K");
         langId = systemInfo::GetSystemDefaultUILanguage();
@@ -107 +110 @@
       return -1;
     }
-    pdh.addCounter(settings.getString(section, prefix + _T("_") + C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
-    pdh.addCounter(settings.getString(section, prefix + _T("_") + C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT), &memCmt);
-    pdh.addCounter(settings.getString(section, prefix + _T("_") + C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT), &upTime);
-    pdh.addCounter(settings.getString(section, prefix + _T("_") + C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT), &cpu);
-    try {
+
+    try {
+      std::wstring proc;
+      std::wstring uptime;
+      std::wstring memCl;
+      std::wstring memCb;
+      if (bUseIndex) {
+        NSC_DEBUG_MSG_STD(_T("Using index to retrive counternames"));
+        proc = _T("\\") + pdh.lookupIndex(238) + _T("(_total)\\") + pdh.lookupIndex(6);
+        uptime = _T("\\") + pdh.lookupIndex(2) + _T("\\") + pdh.lookupIndex(674);
+        memCl = _T("\\") + pdh.lookupIndex(4) + _T("\\") + pdh.lookupIndex(30);
+        memCb = _T("\\") + pdh.lookupIndex(4) + _T("\\") + pdh.lookupIndex(26);
+      } else {
+        proc = settings.getString(section, prefix + _T("_") + C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT);
+        uptime = settings.getString(section, prefix + _T("_") + C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT);
+        memCl = settings.getString(section, prefix + _T("_") + C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT);
+        memCb = settings.getString(section, prefix + _T("_") + C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT);
+      }
+      NSC_DEBUG_MSG_STD(_T("Found counternames: CPU:    ") + proc);
+      NSC_DEBUG_MSG_STD(_T("Found counternames: UPTIME: ") + uptime);
+      NSC_DEBUG_MSG_STD(_T("Found counternames: MCL:    ") + memCl);
+      NSC_DEBUG_MSG_STD(_T("Found counternames: MCB:    ") + memCb);
+      pdh.addCounter(proc, &cpu);
+      pdh.addCounter(uptime, &upTime);
+      pdh.addCounter(memCl, &memCmtLim);
+      pdh.addCounter(memCb, &memCmt);
       pdh.open();
     } catch (const PDH::PDHException &e) {
       NSC_LOG_ERROR_STD(_T("Failed to open performance counters: ") + e.getError());
+      pdh.removeAllCounters();
       NSC_LOG_ERROR_STD(_T("Trying to use default (English) counters"));
-      pdh.removeAllCounters();
+      SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT));
       pdh.addCounter(C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT, &memCmtLim);
       pdh.addCounter(C_SYSTEM_MEM_PAGE_DEFAULT, &memCmt);