Changeset 16524 for trunk

Timestamp:

05/31/13 13:06:25 (11 years ago)

Author:

tbretz

Message:

Simplified GUI_STATS

File:

• trunk/FACT++/src/FAD.h (modified) (2 diffs)

trunk/FACT++/src/FAD.h

@@ -132 +132 @@
 
 typedef struct {
-  //info about status of the main threads
-   int32_t  readStat ;          //read thread
-   int32_t  procStat ;          //processing thread(s)
-   int32_t  writStat ;          //write thread
+  //info about (current state of) the buffer 
+   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)
 
-  //info about (current state of) the buffer 
-   int32_t  bufNew ;            //# incomplete events in buffer
-   int32_t  bufEvt ;            //# complete events in buffer
-   int32_t  bufTot ;            //# total events currently in buffer
-   int32_t  maxEvt ;            //# maximum events in buffer past cycle
-   int32_t  xxxEvt ;            //# maximum events ever in buffer
    uint64_t totMem;             //# Bytes available in Buffer
    uint64_t usdMem;             //# Bytes currently used
-   uint64_t xxxMem;             //max # Bytes ever used  **
    uint64_t maxMem;             //max # Bytes used during past cycle
-
-  //counters
-   int32_t  evtSkip ;           //# incomplete Events skipped (timeout)
-   int32_t  evtWrite ;          //# Events written (or flushed if noWrite) 
-   int32_t  evtErr ;            //# Events with errors 
-   int32_t  badRoiE;            //# boards with wrong roi (inconsistent in event)
-   int32_t  badRoiR;            //# boards with wrong roi (inconsistent in run)
-   int32_t  badRoiB;            //# boards with wrong roi (inconsistent in board)
-   int32_t  badRoi[NBOARDS];    //# boards with wrong roi 
 
   //rates
@@ -164 +150 @@
   //connections
    int8_t   numConn[NBOARDS] ;  //#connections per board (at the moment)
-   //int32_t  errConn[NBOARDS] ;  //#I/O errors per board (counter)
    int32_t  rateBytes[NBOARDS]; //#Bytes read this cycle  **
    int64_t  totBytes[NBOARDS];  //#Bytes read (counter)