Changeset 16834 for trunk/FACT++

Timestamp:

06/14/13 10:54:35 (12 years ago)

Author:

tbretz

Message:

Changed the time for an update of the EVENTS service to a number whihc is not a mutiple of 1s, to avoid coincidences with interleaved events (just cosmetics); added a fix which ensures that the replacement of the calibration in runClose is not affecting events which are currenly processed in another thread; use make_shared where possible.

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -493 +493 @@
         // Keep a copy of the currently valid drs calibration
         // and associate it to the run control structure
-        evt.runCtrl->calib = shared_ptr<DrsCalibration>(new DrsCalibration(DataCalib::GetCalibration()));
+        evt.runCtrl->calib = make_shared<DrsCalibration>(DataCalib::GetCalibration());
 
         /*
@@ -631 +631 @@
 
         // If a Drs Calibration has just been finished, all following events
-        // should also be processed with this calibration
+        // should also be processed with this calibration.
+        // Note that this is a generally dangerous operation. Here, the previous
+        // DRS calibration shared_ptr gets freed and if it is the last in use,
+        // the memory will vanish. If another thread accesses that pointer,
+        // it _must_ make a copy of the shared_ptr first to ensure that
+        // the memory will stay in scope until the end of its operation.
         const DrsCalibration &cal = DataCalib::GetCalibration();
         if (!run.calib || run.calib->fStep != cal.fStep || run.calib->fRoi!=cal.fRoi)
-            run.calib = shared_ptr<DrsCalibration>(new DrsCalibration(cal));
+            run.calib = make_shared<DrsCalibration>(cal);
     }
 
@@ -903 +908 @@
             // (Is that necessray, or would a simple offset correct do well already?)
 
+            // This is a very important step. Making a copy of the shared pointer ensures
+            // that another thread (here: runClose) can set a new shared_ptr with new
+            // data without this thread being affected. If we just did run.calib->Apply
+            // the shared_pointer in use here might vanash during the processing, the
+            // memory is freed and we access invalid memory. It is not important
+            // which memory we acces (the old or the new one) because it is just for
+            // display purpose anyway.
+            const shared_ptr<DrsCalibration> cal = run.calib;
+
             // There seems to be a problem using std::array... maybe the size is too big?
             // array<float, (1440+160)*1024> vec2;
             vector<float> vec((1440+160)*roi);
-            run.calib->Apply(vec.data(), event->Adc_Data, start, roi);
+            cal->Apply(vec.data(), event->Adc_Data, start, roi);
 
             // ------------------- Appy DRS-step correction --------------------------
@@ -940 +954 @@
             // ------------------ Update dim service (statistics) ---------------------
 
-            if (fQueueEventData.empty() && now>fLastDimEventData+boost::posix_time::seconds(3))
+            if (fQueueEventData.empty() && now>fLastDimEventData+boost::posix_time::microseconds(3141593))
             {
                 fQueueEventData.emplace(evt.time, evt.trgTyp, evt.trgTyp==0 ? fMaxEvent.second : stats);