Changeset 11337

Timestamp:

07/11/11 11:09:45 (13 years ago)

Author:

tbretz

Message:

Set the CommandStates_t back to the previous values; updated ResetThread

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (2 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -701 +701 @@
     enum CommandStates_t // g_runStat
     {
-        kAbort      = -40,  // quit as soon as possible ('abort')
-        kExit       = -30,  // stop reading, quit when buffered events done ('exit')
-        kReset      = -20,  // Like EXIT but without closing files and sockets
-        kStop       = -10,  // Like ABORT but without closing files and sockets
+        kAbort      = -2,   // quit as soon as possible ('abort')
+        kExit       = -1,   // stop reading, quit when buffered events done ('exit')
         kInitialize =  0,   // 'initialize' (e.g. dim not yet started)
         kHybernate  =  1,   // do nothing for long time ('hybernate') [wakeup within ~1sec]
@@ -910 +908 @@
     void ResetThread()
     {
+        /*
+         if (g_reset > 0)
+
+            * suspend reading
+            * reset = g_reset;
+            * g_reset=0
+
+            * reset% 10
+                == 0  leave event Buffers as they are
+                == 1  let all buffers drain (write (incomplete) events)
+                >  1  flush all buffers (do not write buffered events)
+
+            * (reset/10)%10
+                > 0   close all sockets and destroy them (also free the
+                      allocated read-buffers)
+                      recreate before resuming operation
+                      [ this is more than just close/open that can be
+                        triggered by e.g. close/open the base-socket ]
+
+            * (reset/100)%10
+                > 0   close all open run-files
+
+            * (reset/1000)
+                      sleep so many seconds before resuming operation
+                      (does not (yet) take into account time left when waiting
+                      for buffers getting empty ...)
+
+            * resume_reading
+
+         */
         fMsg.Message("Signal reset to EventBuilder thread...");
-        g_runStat = kReset;
+        g_reset = 102;
     }