Changeset 15605 for trunk

Timestamp:

05/15/13 13:31:02 (12 years ago)

Author:

tbretz

Message:

Decoupled updating event number from writing data to ensure that a slow dim cannot block writing -- hope that won't give a problem with memory, but this should only happen when it blocks really for a long long time.

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -85 +85 @@
     uint32_t fLastOpened;
     uint32_t fLastClosed;
-    uint32_t fNumEvts[4];
+    array<uint32_t,4> fNumEvts;
 
     DimWriteStatistics  fDimWriteStats;
@@ -111 +111 @@
     Queue<pair<Time,GUI_STAT>> fDimQueue1;
     Queue<tuple<Time,bool,FAD::EventHeader>> fDimQueue2;
+    Queue<pair<Time,array<uint32_t,4>>> fDimQueue3;
     
     bool fDebugStream;
@@ -269 +270 @@
         fDimQueue1(std::bind(&EventBuilderWrapper::factStatSend, this, placeholders::_1)),
         fDimQueue2(std::bind(&EventBuilderWrapper::procHeader, this, placeholders::_1)),
+        fDimQueue3(std::bind(&EventBuilderWrapper::updateEvents, this, placeholders::_1)),
         fDebugStream(false), fDebugRead(false), fDebugLog(false), fNightAsInt(0)
     {
@@ -276 +278 @@
         This = this;
 
-        memset(fNumEvts, 0, sizeof(fNumEvts));
+        memset(fNumEvts.data(), 0, sizeof(fNumEvts));
         fDimEvents.Update(fNumEvts);
 
@@ -637 +639 @@
     vector<DataProcessorImp*> fFiles;
 
+    void updateEvents(const pair<Time,array<uint32_t>,4>> &stat)
+    {
+        fDimEvents.setData(stat.second.data(), sizeof(uint32_t)*4);
+        fDimEvents.Update(stat.first);
+    }
+
     FileHandle_t runOpen(uint32_t runid, RUN_HEAD *h, size_t)
     {
@@ -710 +718 @@
 
         fNumEvts[kCurrent] = 0;
-        fDimEvents.Update(fNumEvts);
+        fDimQueue3.post(fNumEvts);
         // fDimCurrentEvent.Update(uint32_t(0));
 
@@ -736 +744 @@
         if (newt>oldt+boost::posix_time::seconds(1))
         {
-            fDimEvents.Update(fNumEvts);
+            fDimQueue3.post(fNumEvts);
+            //fDimEvents.Update(fNumEvts);
             oldt = newt;
         }
@@ -796 +805 @@
         UpdateRuns();
 
-        fDimEvents.Update(fNumEvts);
+        fDimQueue3.post(fNumEvts);
+        //fDimEvents.Update(fNumEvts);