Changeset 17236 for trunk

Timestamp:

10/17/13 15:20:41 (11 years ago)

Author:

tbretz

Message:

Using the new Queue implementation, all queued functions need to return true so that the event is afterwards removed from the queue.

File:

• trunk/FACT++/src/EventBuilder.cc (modified) (9 diffs)

trunk/FACT++/src/EventBuilder.cc

@@ -11 +11 @@
 #include <boost/algorithm/string/join.hpp>
 
-#include "queue.h"
+#include "../externals/Queue.h"
 
 #include "MessageImp.h"
@@ -802 +802 @@
 // ==========================================================================
 
-void proc1(const shared_ptr<EVT_CTRL2> &);
+bool proc1(const shared_ptr<EVT_CTRL2> &);
 
 Queue<shared_ptr<EVT_CTRL2>> processingQueue1(bind(&proc1, placeholders::_1));
 
-void proc1(const shared_ptr<EVT_CTRL2> &evt)
+bool proc1(const shared_ptr<EVT_CTRL2> &evt)
 {
     applyCalib(*evt, processingQueue1.size());
+    return true;
 }
 
@@ -814 +815 @@
 // a command queue, to which command+data is posted,
 // (e.g. runOpen+runInfo, runClose+runInfo, evtWrite+evtInfo)
-void writeEvt(const shared_ptr<EVT_CTRL2> &evt)
+bool writeEvt(const shared_ptr<EVT_CTRL2> &evt)
 {
     //const shared_ptr<RUN_CTRL2> &run = evt->runCtrl;
@@ -832 +833 @@
                 factPrintf(MessageImp::kError, "Could not open new file for run %d (evt=%d, runOpen failed)", evt->runNum, evt->evNum);
                 run.fileStat = kFileClosed;
-                return;
+                return true;
             }
 
@@ -846 +847 @@
     // File already closed
     if (run.fileStat==kFileClosed)
-        return;
+        return true;
 
     bool rc1 = true;
@@ -859 +860 @@
     // ... this is the case if CloseRunFile was called before any file was opened.
     if (run.fileStat!=kFileOpen)
-        return;
+        return true;
 
     // File is not yet to be closed.
     if (rc1 && evt->closeRequest==kRequestNone)
-        return;
+        return true;
 
     runClose(run);
@@ -886 +887 @@
     const string str = boost::algorithm::join(reason, ", ");
     factPrintf(MessageImp::kInfo, "File closed because %s",  str.c_str());
+
+    return true;
 }
 
 Queue<shared_ptr<EVT_CTRL2>> secondaryQueue(bind(&writeEvt, placeholders::_1));
 
-void procEvt(const shared_ptr<EVT_CTRL2> &evt)
+bool procEvt(const shared_ptr<EVT_CTRL2> &evt)
 {
     if (evt->valid())
@@ -914 +917 @@
         {
             secondaryQueue.emplace(new EVT_CTRL2(kRequestEventCheckFailed, evt->runCtrl));
-            return;
+            return true;
         }
     }
@@ -920 +923 @@
     // If file is open post the event for being written
     secondaryQueue.post(evt);
+
+    return true;
 }