Changeset 99e4d8f in nscp for include/thread.h

Timestamp:

11/24/07 00:30:28 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

7e33d82

Parents:

58a724d

Message:

2007-11-23 MickeM

• Converted to unicode (damn sometimes I HATE C++) + Added support for escaping " on the /test syntax so now you can do: CheckWMI MaxCrit=3 "MinWarn=1" "Query:load=Select * from win32_Processor"

2007-11-22 MickeM

• Fixed so the "default path" is correct even when running as a service (issue: #96)

File:

• include/thread.h (modified) (10 diffs)

include/thread.h

@@ -26 +26 @@
 class ThreadException {
 public:
-  std::string e_;
-  ThreadException(std::string e) : e_(e) {
-    std::cerr << e << std::endl;
+  std::wstring e_;
+  ThreadException(std::wstring e) : e_(e) {
+    std::wcerr << e << std::endl;
   }
 };
@@ -58 +58 @@
 class Thread {
 private:
-  std::string threadid_;
+  std::wstring threadid_;
   HANDLE hThread_;    // Thread handle
   T* pObject_;      // Wrapped object
@@ -81 +81 @@
    * Sets up default values
    */
-  Thread(std::string threadid) : threadid_(threadid), hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
+  Thread(std::wstring threadid) : threadid_(threadid), hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
     hMutex_ = CreateMutex(NULL, FALSE, NULL);
     assert(hMutex_ != NULL);
@@ -95 +95 @@
         ;
       else if (bThreadHasBeenClosed||bThreadHasTerminated)
-        std::cout << "Thread has not terminated correctly: " << threadid_ << "..." << std::endl;
+        std::wcout << "Thread has not terminated correctly: " << threadid_ << "..." << std::endl;
       /*
       MutexLock mutex(hMutex_, 5000L);
@@ -153 +153 @@
       MutexLock mutex(hMutex_, 5000L);
       if (!mutex.hasMutex()) {
-        throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not started...");
+        throw ThreadException(_T("Could not retrieve mutex, thread (") + threadid_ + _T(") not started..."));
       }
       if (pObject_) {
-        throw ThreadException("Thread already started, thread (" + threadid_ + ") not started...");
+        throw ThreadException(_T("Thread already started, thread (") + threadid_ + _T(") not started..."));
       }
 //      assert(hStopEvent_ == NULL);
@@ -179 +179 @@
       MutexLock mutex(hMutex_, delay);
       if (!mutex.hasMutex()) {
-        throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
+        throw ThreadException(_T("Could not retrieve mutex, thread (") + threadid_ + _T(") not stopped..."));
       }
       if (!pObject_)
@@ -193 +193 @@
       return true;
     }
-    std::cerr << "Failed to terminate thread: " << threadid_ << "..." << std::endl;
+    std::wcerr << _T("Failed to terminate thread: ") << threadid_ << _T("...") << std::endl;
     assert(false);
     return false;
@@ -200 +200 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
+      throw ThreadException(_T("Could not retrieve mutex, thread (") + threadid_ + _T(") not stopped..."));
     }
     if (bThreadHasTerminated||bThreadHasBeenClosed)
@@ -209 +209 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
+      throw ThreadException(_T("Could not retrieve mutex, thread (") + threadid_ + _T(") not stopped..."));
     }
     if (bThreadHasTerminated||bThreadHasBeenClosed)
@@ -218 +218 @@
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
-      throw ThreadException("Could not retrieve mutex, thread (" + threadid_ + ") not stopped...");
+      throw ThreadException(_T("Could not retrieve mutex, thread (") + threadid_ + _T(") not stopped..."));
     }
     if (bThreadHasTerminated||bThreadHasBeenClosed)