Changeset 11895 for trunk/FACT++

Timestamp:

08/12/11 09:47:58 (13 years ago)

Author:

tbretz

Message:

Latest one socket version with a fix to stop buffering data after the requested number of events.

File:

• trunk/FACT++/src/EventBuilder.c (modified) (16 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -1 +1 @@
 
 // // // #define EVTDEBUG
+
+#define NUMSOCK   1          //set to 7 for old configuration
+#define MAXREAD  65536       //64kB wiznet buffer
 
 #include <stdlib.h>
@@ -18 +21 @@
 #include <netinet/tcp.h>
 #include <pthread.h>
-#include <sched.h>
+#include <sched.h>                              
 
 #include "EventBuilder.h"
@@ -147 +150 @@
    int32_t bufPos;              //next byte to read to the buffer next
    int32_t bufLen;              //number of bytes left to read
+// size_t bufLen;               //number of bytes left to read size_t might be better
    int32_t skip;                //number of bytes skipped before start of event
 
@@ -441 +445 @@
    for (k = 0; k < MAX_RUN; k++) {
       if (runCtrl[k].runId == runID) {
-         if (runCtrl[k].procId > 0) {   //run is closed -> reject
-            snprintf (str, MXSTR, "skip event since run %d finished", runID);
-            factOut (kInfo, 931, str);
-            return -21;
-         }
+//         if (runCtrl[k].procId > 0) {   //run is closed -> reject
+//            snprintf (str, MXSTR, "skip event since run %d finished", runID);
+//            factOut (kInfo, 931, str);
+//            return -21;
+//         }
 
          if (runCtrl[k].roi0 != nRoi[0]
@@ -490 +494 @@
       runCtrl[evFree].firstTime = runCtrl[evFree].lastTime = tsec;
       runCtrl[evFree].closeTime = tsec + 3600 * 24;     //max time allowed
-      runCtrl[evFree].lastTime = 0;
+//    runCtrl[evFree].lastTime = 0;
 
       runTail[evFree].nEventsOk =
@@ -768 +772 @@
    numok = numok2 = 0;
 
+   int cntsock = 8 - NUMSOCK ;
+
    if (gi_resetS > 0) {
       //make sure all sockets are preallocated as 'not exist'
@@ -796 +802 @@
          gj.evtSkip = gj.evtWrite = gj.evtErr = 0;
 
-      int b;
+      int b,p;
       for (b = 0; b < NBOARDS; b++)
          gj.badRoi[b] = 0;
@@ -861 +867 @@
 
       for (i = 0; i < MAX_SOCK; i++) {  //check all sockets if something to read
-         b = i / 7;
+         b = i / 7 ;
+         p = i % 7 ;
+
+//if ( b==32 && p>0) {  ; }
+if ( p >= NUMSOCK) { ; }
+else {
          if (sockDef[b] > 0)
             s0 = +1;
@@ -881 +892 @@
                rd[i].bufPos = 0;        //  no byte read so far
                rd[i].skip = 0;  //  start empty
-               gi_NumConnect[b]++;
+//             gi_NumConnect[b]++;
+               gi_NumConnect[b] += cntsock ;
+
                gi.numConn[b]++;
                gj.numConn[b]++;
@@ -892 +905 @@
             if (rd[i].bufLen > 0) {     //might be nothing to read [buffer full]
                numok++;
+               size_t maxread = rd[i].bufLen ;
+               if (maxread > MAXREAD ) maxread=MAXREAD ;
+
                jrd =
                   recv (rd[i].socket, &rd[i].rBuf->B[rd[i].bufPos],
-                        rd[i].bufLen, MSG_DONTWAIT);
+                        maxread, MSG_DONTWAIT);
+//                      rd[i].bufLen, MSG_DONTWAIT);
 
                if (jrd > 0) {
@@ -914 +931 @@
                   GenSock (s0, i, 0, NULL, &rd[i]);
                   gi.gotErr[b]++;
-                  gi_NumConnect[b]--;
+//                gi_NumConnect[b]--;
+                  gi_NumConnect[b]-= cntsock ;
                   gi.numConn[b]--;
                   gj.numConn[b]--;
@@ -1220 +1238 @@
 
             }                   //end interpreting last read
+}
          }                      //end of successful read anything
       }                         //finished trying to read all sockets
@@ -1352 +1371 @@
             GenSock (-1, i, 0, NULL, &rd[i]);   //close and destroy open socket   
             if (i % 7 == 0) {
-               gi_NumConnect[i / 7]--;
+//             gi_NumConnect[i / 7]--;
+               gi_NumConnect[i / 7]-= cntsock ;
                gi.numConn[i / 7]--;
                gj.numConn[i / 7]--;
@@ -1644 +1664 @@
                      runCtrl[j].fileId = 91;
                      runCtrl[j].procId = 91;
-                  } else {
+                  } else {                                                 
                      snprintf (str, MXSTR, "P opened new run_file %d evt %d",
                                irun, ievt);
@@ -1670 +1690 @@
                             "P skip event %d because no active run %d", ievt,
                             irun);
-                  factOut (kInfo, 502, str);
+                  factOut (kDebug, 502, str);
                   evtCtrl.evtStat[k0] = 9091;
                } else {
 //--------
 //--------
-                  int id = evtCtrl.evtBuf[k0];
+                      id = evtCtrl.evtBuf[k0];
                   int itevt = mBuffer[id].trgNum;
                   int itrg = mBuffer[id].trgTyp;
@@ -2080 +2100 @@
 
          if (runCtrl[j].procId == 0) {
-            runFinish (runCtrl[j].runId);
+            runFinish1 (runCtrl[j].runId);
             runCtrl[j].procId = 92;
          }