Changeset 16525

Timestamp:

05/31/13 13:11:47 (12 years ago)

Author:

tbretz

Message:

Adapted to changes in GUI_STATS

File:

• trunk/FACT++/gui/FactGui.h (modified) (2 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1561 +1561 @@
 
         /*
-         //info about status of the main threads
-         int32_t  readStat ;          //read thread
-         int32_t  procStat ;          //processing thread(s)
-         int32_t  writStat ;          //write thread
+         uint32_t bufNew ;            //# incomplete events in buffer (evtCtrl)
+         uint32_t bufEvt ;            //# complete events in buffer  (primaryQueue)
+         uint32_t bufWrite ;          //# events in write queue (secondaryQueue)
+         uint32_t bufProc ;           //# events in processing queue (processingQueue1)
+         uint32_t bufTot ;            //# total events currently in buffer (this corresponds to totMem)
+
+         uint64_t totMem;             //# Bytes available in Buffer
+         uint64_t usdMem;             //# Bytes currently used
+         uint64_t maxMem;             //max # Bytes used during past cycle
          */
 
-        fFadBufferMax->setValue(stat.totMem/1000000);
+        fFadBufferMax->setValue(stat.maxMem/1000000);
         fFadBuffer->setMaximum(stat.totMem/100);
-        fFadBuffer->setValue((stat.maxMem>stat.totMem?stat.totMem:stat.maxMem)/100);  // Max mem used in last second
+        fFadBuffer->setValue(stat.usdMem/100);  // Max mem used in last second
 
         uint32_t sum = 0;
-        //int32_t  min = 0x7fffff;
-        //int32_t  max = 0;
-
         int cnt = 0;
 
         for (int i=0; i<40; i++)
         {
-            if (stat.numConn[i]!=1)
-                continue;
-
-            cnt++;
-
-            sum += stat.rateBytes[i];
-
-            //if (stat.rateBytes[i]<min)
-            //    min = stat.rateBytes[i];
-            //if (stat.rateBytes[i]>max)
-            //    max = stat.rateBytes[i];
+            if (stat.numConn[i]==1)
+            {
+                sum += stat.rateBytes[i];
+                cnt++;
+            }
         }
 
@@ -1596 +1592 @@
         fFadEvtBufNew->setValue(stat.bufNew);  // Incomplete in buffer
         fFadEvtBufEvt->setValue(stat.bufEvt);  // Complete in buffer
-        fFadEvtBufMax->setValue(stat.maxEvt);  // Complete in buffer
-        fFadEvtWrite->setValue(stat.evtWrite-stat.evtSkip-stat.evtErr);
-        fFadEvtSkip->setValue(stat.evtSkip);
-        fFadEvtErr->setValue(stat.evtErr);
+        fFadEvtBufMax->setValue(stat.bufTot);  // Complete in buffer
+        fFadEvtWrite->setValue(stat.bufWrite);
+        fFadEvtSkip->setValue(stat.bufProc);
 
         if (stat.deltaT==0)