Changeset 11342 for trunk/FACT++/src

Timestamp:

07/11/11 16:03:44 (14 years ago)

Author:

tbretz

Message:

Divided Reset into soft and hard reset.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (2 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1184 +1184 @@
     }
 
-    int Reset()
-    {
-        ResetThread();
+    int Reset(bool soft)
+    {
+        ResetThread(soft);
         return T::GetCurrentState();
     }
@@ -1532 +1532 @@
             ("Immediately abort EventBuilder thread and disconnect all slots.");
 
-        T::AddEvent("RESET", FAD::kDisconnected)
-            (boost::bind(&StateMachineFAD::Reset, this))
-            ("Flush all buffers, close all files  and reinitialize event builder thread.");
+        T::AddEvent("SOFT_RESET", FAD::kConnected)
+            (boost::bind(&StateMachineFAD::Reset, this, true))
+            ("Wait for buffers to drain, close all files and reinitialize event builder thread.");
+
+        T::AddEvent("HARD_RESET", FAD::kConnected)
+            (boost::bind(&StateMachineFAD::Reset, this, false))
+            ("Free all buffers, close all files and reinitialize event builder thread.");
 
         T::AddEvent("CONNECT", "S:1", FAD::kDisconnected, FAD::kConnecting, FAD::kConnected)