Changeset 8823 for trunk/MagicSoft/Cosy

Timestamp:

01/24/08 09:10:00 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• candrv/nodedrv.cc (modified) (5 diffs)
• telesto.cc (added)
• tpoint/Makefile (added)
• tpoint/TPointGui.cc (added)
• tpoint/TPointGui.h (added)
• tpoint/TPointIncl.h (added)
• tpoint/TPointLinkDef.h (added)
• tpoint/TPointStar.cc (added)
• tpoint/TPointStar.h (added)
• tpoint/skull.xpm (added)

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -484 +484 @@
 // least one Nodeguard message was answered.
 //
-class NodeGuard : public MThread
+class NodeGuard : public MyThreadX
 {
     Double_t fTimeoutTime;     //[s]
@@ -496 +496 @@
 public:
     NodeGuard(NodeDrv *drv, Int_t guard, Int_t ltf, Bool_t canopen)
-        : MThread(false), fGuardTime(guard/1000.), fLifeTimeFactor(ltf), fIsCanOpen(canopen), fDrv(drv) { }
+        : MyThreadX("NodeGuard"), fGuardTime(guard/1000.), fLifeTimeFactor(ltf), fIsCanOpen(canopen), fDrv(drv) { }
 
     void Reset(const timeval_t *tv=NULL)
@@ -509 +509 @@
     }
 
-    void *Thread()
+    Int_t Thread()
     {
         Reset();
 
-        while (!HasStopFlag())
+        while (!IsThreadCanceled())
         {
             // Sending nodeguards seems to result in
@@ -527 +527 @@
             const Double_t t0 = t+fGuardTime;
 
-            while (!HasStopFlag() && (double)t<t0 && (double)t<fTimeoutTime)
+            while ((double)t<t0 && (double)t<fTimeoutTime)
             {
-                usleep(5);
+                Sleep(100);
                 t.Now();
             }
@@ -553 +553 @@
 
     fGuard = new NodeGuard(this, fGuardTime, fLifeTimeFactor, real);
-    fGuard->Start();
+    fGuard->RunThread();
 
     lout << "- " << GetNodeName() << ": Guarding (" << dec;