Changeset ee230f7 in nscp for modules/CheckSystem/PDHCollector.h

Timestamp:

08/04/12 07:34:11 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

c91916f

Parents:

6aac723

Message:

• Hopefully fixed the "cant load counter" issue by reowrking how counters are handled.

File:

• modules/CheckSystem/PDHCollector.h (modified) (4 diffs)

modules/CheckSystem/PDHCollector.h

@@ -21 +21 @@
 #pragma once
 
+#include <boost/thread.hpp>
+
 #include <pdh.hpp>
-#include <thread.h>
-#include <MutexRW.h>
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
@@ -105 +105 @@
     unsigned int check_intervall;
     std::wstring buffer_length;
+    std::wstring subsystem;
 
     std::list<counter> counters;
@@ -111 +112 @@
 private:
 
-  //system_counter_data *data_;
-  MutexRW mutex_;
-  HANDLE hStopEvent_;
+  boost::shared_mutex mutex_;
+  HANDLE stop_event_;
   typedef boost::shared_ptr<PDHCollectors::PDHCollector> collector_ptr;
   typedef boost::unordered_map<std::wstring,collector_ptr > counter_map;
   counter_map counters_;
   int check_intervall_;
+  boost::shared_ptr<boost::thread> thread_;
+  boost::shared_ptr<system_counter_data> thread_data_;
 
 public:
   PDHCollector();
   virtual ~PDHCollector();
-  DWORD threadProc(LPVOID lpParameter);
+  void thread_proc();
   void exitThread(void);
 
@@ -135 +137 @@
   double get_avg_value(std::wstring counter, unsigned int delta);
   double get_double(std::wstring counter);
+  void start(boost::shared_ptr<system_counter_data> data);
+  bool stop();
 };
-
-
-typedef Thread<PDHCollector> PDHCollectorThread;