Changeset 16569

Timestamp:

06/02/13 02:19:43 (12 years ago)

Author:

tbretz

Message:

Show an out-of-memory message not more often than once a second; therefore, moved the reportMem to the runCtrl structure and changed the type to time_t

Location:

trunk/FACT++/src

Files:

• EventBuilder.cc (modified) (1 diff)
• EventBuilder.h (modified) (5 diffs)

trunk/FACT++/src/EventBuilder.cc

@@ -1217 +1217 @@
             if (evt && !evt->initMemory())
             {
-                if (evt->reportMem)
+                const time_t tm = time(NULL);
+                if (evt->runCtrl->reportMem==tm)
                     continue;
 
                 factPrintf(MessageImp::kError, "No free memory left for %d (run=%d)", evt->evNum, evt->runNum);
-                evt->reportMem = true;
+                evt->runCtrl->reportMem = tm;
                 continue;
             }

trunk/FACT++/src/EventBuilder.h

@@ -49 +49 @@
     int64_t runId ;      // Run number
 
+    time_t reportMem;        // initMemory has reported no memory once (set outside of class)
+
     time_t openTime;     // Time when first event (first board) was received
     time_t lastTime;     // Time when last event was received (set when first board data received)
@@ -67 +69 @@
     std::list<std::array<int16_t,1440>> prevStart; // History for start cells of previous events (for step calibration)
 
-    RUN_CTRL2() : runId(-1), lastTime(0), lastEvt(0), maxEvt(1<<31), fileStat(kFileNotYetOpen)
+    RUN_CTRL2() : runId(-1), reportMem(0), lastTime(0), lastEvt(0), maxEvt(1<<31), fileStat(kFileNotYetOpen)
     {
         // runId   = -1;
@@ -119 +121 @@
     PEVNT_HEADER *header;  // Pointer to a valid header within FADhead
 
-    bool reportMem;        // initMemory has reported no memory once (set outside of class)
     int closeRequest;
 
@@ -126 +127 @@
     // Be carefull with this constructor... writeEvt can seg fault
     // it gets an empty runCtrl
-    EVT_CTRL2() : nBoard(0), FADhead(0), header(0), reportMem(false), closeRequest(kRequestNone)
+    EVT_CTRL2() : nBoard(0), FADhead(0), header(0), closeRequest(kRequestNone)
     {
         //flag all boards as unused
@@ -138 +139 @@
         }*/
 
-    EVT_CTRL2(int req, const std::shared_ptr<RUN_CTRL2> &run) : nBoard(0), FADhead(0), header(0), reportMem(false), closeRequest(req), runCtrl(run)
+    EVT_CTRL2(int req, const std::shared_ptr<RUN_CTRL2> &run) : nBoard(0), FADhead(0), header(0), closeRequest(req), runCtrl(run)
     {
         //flag all boards as unused