Changeset fff754b in nscp

Timestamp:

08/06/12 23:43:08 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

29ff7e1

Parents:

48b6b97

Message:

• Re implemented INSTANCES command via the new pdh exec subsystem.

Files:

• changelog (modified) (1 diff)
• include/pdh/enumerations.hpp (modified) (3 diffs)
• include/socket/client.hpp (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (8 diffs)
• modules/NSClientServer/NSClientServer.cpp (modified) (2 diffs)

changelog

@@ -7 +7 @@
 2012-08-04 MickeM
  * Re implemented INSTANCES command via the new pdh exec subsystem.
-   Still has an unfixed isue as it return duplicates (one for each counter on the object) which will be fixed later today.
 
 2012-08-04 MickeM

include/pdh/enumerations.hpp

@@ -40 +40 @@
 
     typedef std::list<Object> Objects;
-    static Objects EnumObjects(DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
+
+
+    static void fetch_object_details(Object &object, bool instances = true, bool objects = true, DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
+      DWORD dwCounterBufLen = 0;
+      TCHAR* szCounterBuffer = NULL;
+      DWORD dwInstanceBufLen = 0;
+      TCHAR* szInstanceBuffer = NULL;
+      try {
+        PDH::PDHError status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, object.name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
+        if (status.is_more_data()) {
+          szCounterBuffer = new TCHAR[dwCounterBufLen+1];
+          szInstanceBuffer = new TCHAR[dwInstanceBufLen+1];
+
+          status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, object.name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
+          if (status.is_error()) {
+            delete [] szCounterBuffer;
+            delete [] szInstanceBuffer;
+            object.error = "Failed to enumerate object: " + utf8::cvt<std::string>(object.name);
+          }
+
+          if (dwCounterBufLen > 0 && objects) {
+            TCHAR *cp=szCounterBuffer;
+            while(*cp != '\0') {
+              object.counters.push_back(cp);
+              cp += lstrlen(cp)+1;
+            }
+          }
+          if (dwInstanceBufLen > 0 && instances) {
+            TCHAR *cp=szInstanceBuffer;
+            while(*cp != '\0') {
+              object.instances.push_back(cp);
+              cp += lstrlen(cp)+1;
+            }
+          }
+          delete [] szCounterBuffer;
+          delete [] szInstanceBuffer;
+        } else {
+          object.error = "Failed to enumerate object: " + utf8::cvt<std::string>(object.name);
+        }
+      } catch (std::exception &e) {
+        object.error = e.what();
+      } catch (...) {
+        object.error = "Exception fetching data for: " + utf8::cvt<std::string>(object.name);
+      }
+    }
+    static Objects EnumObjects(bool instances = true, bool objects = true, DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
       Objects ret;
 
@@ -63 +108 @@
       delete [] szObjectBuffer;
 
-      BOOST_FOREACH(Object &o, ret) {
-        DWORD dwCounterBufLen = 0;
-        TCHAR* szCounterBuffer = NULL;
-        DWORD dwInstanceBufLen = 0;
-        TCHAR* szInstanceBuffer = NULL;
-        try {
-          status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, o.name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-          if (status.is_more_data()) {
-            szCounterBuffer = new TCHAR[dwCounterBufLen+1024];
-            szInstanceBuffer = new TCHAR[dwInstanceBufLen+1024];
-
-            status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, o.name.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-            if (status.is_error()) {
-              delete [] szCounterBuffer;
-              delete [] szInstanceBuffer;
-              throw PDHException(_T("PdhEnumObjectItems failed when trying to retrieve buffer for ") + o.name, status);
-            }
-
-            if (dwCounterBufLen > 0) {
-              cp=szCounterBuffer;
-              while(*cp != '\0') {
-                o.counters.push_back(cp);
-                cp += lstrlen(cp)+1;
-              }
-            }
-            if (dwInstanceBufLen > 0) {
-              cp=szInstanceBuffer;
-              while(*cp != '\0') {
-                o.counters.push_back(cp);
-                cp += lstrlen(cp)+1;
-              }
-            }
-            delete [] szCounterBuffer;
-            delete [] szInstanceBuffer;
-          }
-        } catch (std::exception &e) {
-          o.error = e.what();
-        } catch (...) {
-          o.error = "Exception fetching data";
+      if (objects || instances) {
+        BOOST_FOREACH(Object &o, ret) {
+          fetch_object_details(o, instances, objects, dwDetailLevel);
         }
       }
@@ -107 +116 @@
     }
 
-    static Object EnumObject(std::wstring object, DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
+    static Object EnumObject(std::wstring object, bool instances = true, bool objects = true, DWORD dwDetailLevel = PERF_DETAIL_WIZARD) {
       Object ret;
       ret.name = object;
-      DWORD dwCounterBufLen = 0;
-      TCHAR* szCounterBuffer = NULL;
-      DWORD dwInstanceBufLen = 0;
-      TCHAR* szInstanceBuffer = NULL;
-      try {
-        PDH::PDHError status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, object.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-        if (status.is_more_data()) {
-          szCounterBuffer = new TCHAR[dwCounterBufLen+1024];
-          szInstanceBuffer = new TCHAR[dwInstanceBufLen+1024];
-
-          status = PDH::PDHFactory::get_impl()->PdhEnumObjectItems(NULL, NULL, object.c_str(), szCounterBuffer, &dwCounterBufLen, szInstanceBuffer, &dwInstanceBufLen, dwDetailLevel, 0);
-          if (status.is_error()) {
-            delete [] szCounterBuffer;
-            delete [] szInstanceBuffer;
-            throw PDHException(_T("PdhEnumObjectItems failed when trying to retrieve buffer for ") + object, status);
-          }
-
-          if (dwCounterBufLen > 0) {
-            TCHAR *cp=szCounterBuffer;
-            while(*cp != '\0') {
-              ret.counters.push_back(cp);
-              cp += lstrlen(cp)+1;
-            }
-          }
-          if (dwInstanceBufLen > 0) {
-            TCHAR *cp=szInstanceBuffer;
-            while(*cp != '\0') {
-              ret.instances.push_back(cp);
-              cp += lstrlen(cp)+1;
-            }
-          }
-          delete [] szCounterBuffer;
-          delete [] szInstanceBuffer;
-        }
-      } catch (std::exception &e) {
-        ret.error = e.what();
-      } catch (...) {
-        ret.error = "Exception fetching data";
-      }
+      fetch_object_details(ret, instances, objects, dwDetailLevel);
       return ret;
     }

include/socket/client.hpp

@@ -331 +331 @@
 
       typename protocol_type::response_type process_request(typename protocol_type::request_type &packet, int retries = 3) {
-        boost::optional<protocol_type::response_type> response = connection_->process_request(packet);
+        boost::optional<typename protocol_type::response_type> response = connection_->process_request(packet);
         if (!response) {
           for (int i=0;i<retries;i++) {

modules/CheckSystem/CheckSystem.cpp

@@ -309 +309 @@
 bool render_list(const PDH::Enumerations::Objects &list, bool validate, bool porcelain, std::wstring filter, std::wstring &result) {
   if (!porcelain) {
-    result += _T("Listing all counters\n");
+    result += _T("Listing counters\n");
     result += _T("---------------------------\n");
   }
@@ -315 +315 @@
     int total = 0, match = 0;
     BOOST_FOREACH(const PDH::Enumerations::Object &obj, list) {
-      if (!obj.error.empty()) {
-        result += _T("error,") + obj.name + _T(",") + utf8::to_unicode(obj.error) + _T("\n");
+      if (porcelain) {
+        BOOST_FOREACH(const std::wstring &inst, obj.instances) {
+          std::wstring line = _T("\\") + obj.name + _T("(") + inst + _T(")\\") ;
+          total++;
+          if (!filter.empty() && line.find(filter) == std::wstring::npos)
+            continue;
+          result += _T("instance,") + qoute(obj.name) + _T(",") + qoute(inst) + _T("\n");
+          match++;
+        }
+        BOOST_FOREACH(const std::wstring &count, obj.counters) {
+          std::wstring line = _T("\\") + obj.name + _T("\\") + count;
+          total++;
+          if (!filter.empty() && line.find(filter) == std::wstring::npos)
+            continue;
+          result += _T("counter,") + qoute(obj.name) + _T(",") + qoute(count) + _T("\n");
+          match++;
+        }
+        if (obj.instances.empty() && obj.counters.empty()) {
+          std::wstring line = _T("\\") + obj.name + _T("\\");
+          total++;
+          if (!filter.empty() && line.find(filter) == std::wstring::npos)
+            continue;
+          result += _T("counter,") + qoute(obj.name) + _T(",") + _T(",\n");
+          match++;
+        } else if (!obj.error.empty()) {
+          result += _T("error,") + obj.name + _T(",") + utf8::to_unicode(obj.error) + _T("\n");
+        }
+      } else if (!obj.error.empty()) {
+        result += _T("Failed to enumerate counter ") + obj.name + _T(": ") + utf8::to_unicode(obj.error) + _T("\n");
       } else if (obj.instances.size() > 0) {
         BOOST_FOREACH(const std::wstring &inst, obj.instances) {
@@ -325 +352 @@
               continue;
             boost::tuple<bool,std::wstring> status;
-            if (validate)
+            if (validate) {
               status = validate_counter(line);
-            if (porcelain) 
-              line = _T("counter,") + qoute(obj.name) + _T(",") + qoute(inst) + _T(",") + qoute(count) + _T(", ") + qoute(status.get<1>());
-            else if (validate)
-              line = line + _T(": ") + status.get<1>();
-            result += line + _T("\n");
+              result += line + _T(": ") + status.get<1>() + _T("\n");
+            } else
+              result += line + _T("\n");
             match++;
           }
@@ -342 +367 @@
             continue;
           boost::tuple<bool,std::wstring> status;
-          if (validate)
+          if (validate) {
             status = validate_counter(line);
-
-          if (porcelain) 
-            line = _T("counter,") + qoute(obj.name) + _T(",,") + qoute(count)  + _T(", ") + qoute(status.get<1>());
-          else if (validate)
-            line = line + _T(": ") + status.get<1>();
-          result += line + _T("\n");
+            result += line + _T(": ") + status.get<1>() + _T("\n");
+          } else 
+            result += line + _T("\n");
           match++;
         }
@@ -381 +403 @@
       ("validate", po::wvalue<std::wstring>(&list_string)->implicit_value(_T("")), "List counters and/or instances")
       ("all", "List/check all counters not configured counter")
+      ("no-counters", "Do not recurse and list/validate counters for any matching items")
+      ("no-instances", "Do not recurse and list/validate instances for any matching items")
       ("counter", po::wvalue<std::wstring>(&counter)->implicit_value(_T("")), "Specify which counter to work with")
       ("filter", po::wvalue<std::wstring>(&counter)->implicit_value(_T("")), "Specify a filter to match (substring matching)")
@@ -402 +426 @@
     bool all = vm.count("all");
     bool validate = vm.count("validate");
+    bool no_objects = vm.count("no-counters");
+    bool no_instances = vm.count("no-instances");
     bool list = vm.count("list") || (validate && counter.empty());
     if (counter.empty())
@@ -418 +444 @@
       if (all) {
         // If we specified all list all counters
-        PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+        PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects(!no_instances, !no_objects);
         return render_list(lst, validate, porcelain, counter, result)?NSCAPI::isSuccess:NSCAPI::hasFailed;
       } else {
@@ -424 +450 @@
           // If we specify a counter object we will only list instances of that
           PDH::Enumerations::Objects lst;
-          lst.push_back(PDH::Enumerations::EnumObject(counter));
+          lst.push_back(PDH::Enumerations::EnumObject(counter, !no_instances, !no_objects));
           return render_list(lst, validate, porcelain, counter, result)?NSCAPI::isSuccess:NSCAPI::hasFailed;
         } else {

modules/NSClientServer/NSClientServer.cpp

@@ -210 +210 @@
 std::wstring list_instance(std::wstring counter) {
   std::list<std::wstring> exeresult;
-  nscapi::core_helper::exec_simple_command(_T("*"), _T("pdh"), boost::assign::list_of(std::wstring(_T("--list")))(_T("--porcelain"))(_T("--counter"))(counter), exeresult);
+  nscapi::core_helper::exec_simple_command(_T("*"), _T("pdh"), boost::assign::list_of(std::wstring(_T("--list")))(_T("--porcelain"))(_T("--counter"))(counter)(_T("--no-counters")), exeresult);
   std::wstring result;
 
@@ -221 +221 @@
       Tokenizer tok(line);
       Tokenizer::const_iterator cit = tok.begin();
-      int i = 2;
+      int i = 1;
       while ((i-->0) && (cit != tok.end()))
         ++cit;