Changeset 16779 for trunk/Cosy/base/msgqueue.h

Timestamp:

06/09/13 12:51:13 (11 years ago)

Author:

tbretz

Message:

A less CPU hungry version of the msg queue using C++11 techniques.

File:

• trunk/Cosy/base/msgqueue.h (modified) (3 diffs)

trunk/Cosy/base/msgqueue.h

@@ -2 +2 @@
 #define COSY_MsgQueue
 
-#ifndef ROOT_TMutex
-#include <TMutex.h>
-#endif
-
-#ifndef MARS_MThread
-#include "MThread.h"
+#ifndef __CINT__
+#include <list>
+#include <mutex>
+#include <thread>
+#include <vector>
+#include <condition_variable>
 #endif
 
@@ -13 +13 @@
 #define WM_QUIT 0xffff
 
-class MsgQueue : public MThread
+class MsgQueue
 {
 private:
-    int    fNextMsg;
-    char  *fNextPtr;
+    size_t fSize;                 // Only necessary for before C++11
 
-    TMutex fMuxMsg;
+#ifndef __CINT__
+    std::list<std::pair<int, std::vector<char>>> fList;
 
-    Int_t Thread();
+    std::mutex fMutex;        // Mutex needed for the conditional
+    std::condition_variable fCond; // Conditional
+#endif
+
+    enum state_t
+    {
+        kIdle,
+        kRun,
+        kStop,
+        kAbort,
+    };
+
+    state_t fState;               // Stop signal for the thread
+#ifndef __CINT__
+    std::thread fThread;      // Handle to the thread
+#endif
+
+    void Thread();
 
 public:
@@ -29 +46 @@
     int Break() const;
 
-    virtual Int_t Proc(int msg, void *mp1);
-    Int_t Proc(int msg) { return Proc(msg, 0); }
+    void CancelThread();
+
+    virtual int Proc(int msg, void *mp1);
+    int Proc(int msg) { return Proc(msg, 0); }
 
     void *PostMsg(int msg, void *mp1, int size);