Changeset 2518 for trunk/MagicSoft/Cosy/base

Timestamp:

11/17/03 13:50:48 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/base

Files:

• MTimeout.cc (modified) (1 diff)
• MTimeout.h (modified) (2 diffs)
• msgqueue.cc (modified) (4 diffs)
• msgqueue.h (modified) (3 diffs)
• timer.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/base/MTimeout.cc

@@ -1 +1 @@
 #include "MTimeout.h"
+
+#include <TSystem.h>
+
+MTimeout::MTimeout(unsigned long ms=500) : fTimeout((ULong_t)gSystem->Now()+ms)
+{
+    // Use SetTime to change the timing
+    // if (ms) TurnOn(); // Add to system list
+}
+
+bool MTimeout::HasTimedOut()
+{
+    return fTimeout<(ULong_t)gSystem->Now();
+}
+
+void MTimeout::Start(unsigned long ms=500)
+{
+    fTimeout = (ULong_t)gSystem->Now()+ms;
+    //Reset();  // reset before adding
+    //TurnOn(); // Add to system list
+}

trunk/MagicSoft/Cosy/base/MTimeout.h

@@ -1 @@
-#ifndef MTIMEOUT_H
-#define MTIMEOUT_H
+#ifndef COSY_MTimeout
+#define COSY_MTimeout
 
-#include <TTimer.h>
+//#include <TTimer.h>
 
-class MTimeout : public TTimer
+class MTimeout// : public TTimer
 {
+    /*
     Bool_t Notify()
     {
@@ -11 +12 @@
         return kFALSE;
     }
+     */
+    unsigned long fTimeout;
 
 public:
-    MTimeout(Long_t ms=500) : TTimer(ms, kFALSE)
-    {
-        // Use SetTime to change the timing
-        if (ms) TurnOn(); // Add to system list
-    }
+    MTimeout(unsigned long ms=500);
 
-    void Start()
-    {
-        Reset();  // reset before adding
-        TurnOn(); // Add to system list
-    }
+    bool HasTimedOut();
+
+    void Start(unsigned long ms=500);
 };
 

trunk/MagicSoft/Cosy/base/msgqueue.cc

@@ -89 +89 @@
         // a PostMsg is processed correctly
         //
-        pthread_mutex_lock(&fMuxMsg);
+        fMuxMsg.Lock();
         fBreak = 0;
-        pthread_mutex_unlock(&fMuxMsg);
+        fMuxMsg.UnLock();
 
 #ifdef DEBUG
@@ -130 +130 @@
     cout << "MsgQueue::PostMsg: Locking MsgQueue mutex..." << flush;
 #endif
-    pthread_mutex_lock(&fMuxMsg);
+    fMuxMsg.Lock();
 #ifdef DEBUG
     cout << "done." << endl;
@@ -145 +145 @@
     if (fBreak)
     {
-        pthread_mutex_unlock(&fMuxMsg);
+        fMuxMsg.UnLock();
 #ifdef DEBUG
         cout << "------------> MsgQueue::PostMsg: Proc still pending... Message IGNORED." << endl;
@@ -176 +176 @@
 #endif
     fStart = 1;
-    pthread_mutex_unlock(&fMuxMsg);
+    fMuxMsg.UnLock();
 #ifdef DEBUG
     cout << "done." << endl;

trunk/MagicSoft/Cosy/base/msgqueue.h

@@ -6 +6 @@
 #define WM_NULL 0x0000
 #define WM_QUIT 0xffff
+
+#ifndef ROOT_TMutex
+#include <TMutex.h>
+#endif
 
 class MsgQueue
@@ -19 +23 @@
     void *fRc;    // Proc return code
 
-    pthread_t       fThread;
-    pthread_mutex_t fMuxMsg;
-    pthread_cond_t  fCondMsg;
-    pthread_mutex_t fMuxRc;
-    pthread_cond_t  fCondRc;
+    pthread_t fThread;
+    TMutex    fMuxMsg;
 
     static void *MapThread(void *arg);
@@ -36 +37 @@
 
     virtual void *Proc(int msg, void *mp1);
+    void *Proc(int msg) { return Proc(msg, 0); }
 
     void *PostMsg(int msg, void *mp1, int size);
+    void *PostMsg(int msg) { return PostMsg(msg, 0, 0); }
 };
 

trunk/MagicSoft/Cosy/base/timer.cc

@@ -136 +136 @@
 const char *Timer::GetTimeStr()
 {
-    sprintf(fDateStr, "%d/%02d/%02d %d:%02d:%02d.%06li",
+    sprintf(fDateStr, "%2d/%02d/%02d %d:%02d:%02d.%06li",
             fYea, fMon, fDay, fHor, fMin, fSec, (long)(1000000.0*fMs));
 
@@ -146 +146 @@
     char text[256];
 
-    sprintf(text, "%d/%02d/%02d %d:%02d:%02d.%01li",
+    sprintf(text, "%2d/%02d/%02d %d:%02d:%02d.%01li",
             t.fYea, t.fMon, t.fDay, t.fHor, t.fMin, t.fSec, (long)(10.0*t.fMs));