MAXINPATH changed to 100 plus some minor changes. S.Y.

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index f89d334149118e50abce06ded5e441a3d70fc6a6..1cfb2550bec9f9b6f542809e92e08b80d20a6418 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,5 +1,5 @@
 static char *rcsId =
-  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.79 2007-10-05 09:17:26 hadaq Exp $";
+  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.80 2008-03-31 17:54:40 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -34,7 +34,7 @@ static char *rcsId =
 #include "ansiTape.h"
 #include "genid32.h"
 
-#define MAXINPATH 32
+#define MAXINPATH 100
 
 #define NEVTIDS 64UL           /* must be 2^n */
 #define NEVTIDS_IN_FILE 0UL    /* must be 2^n */
@@ -97,7 +97,7 @@ typedef struct TheStatsS
   unsigned long *evtsTagError;
   unsigned long *bytesWritten;
   unsigned long *evtId[NEVTIDS];
-  unsigned long *trigNr[32];
+  unsigned long *trigNr[MAXINPATH];
   unsigned long *evtsRes;
 } TheStats;
 
@@ -694,7 +694,7 @@ storeInfoStart (const char *n, time_t t, TheArgs * my)
 }
 
 static void
-storeInfoStop (const char *n, time_t t, Worker * w)
+storeInfoStop (const char *n, time_t t, Worker * w, TheArgs * my)
 {
   Param pS, *p = &pS;
   int i;
@@ -702,7 +702,7 @@ storeInfoStop (const char *n, time_t t, Worker * w)
 
   conSetupParam (p, getenv ("DAQ_SETUP"));
 
-  for (i = 0; i < 32 && strcmp (w->statistics[i].name, "") != 0; i++)
+  for (i = 0; i < my->nrOfMsgs && strcmp (w->statistics[i].name, "") != 0; i++)
     {
       Param_storeInt (p, n, w->statistics[i].name, w->statistics[i].value);
     }
@@ -1338,6 +1338,18 @@ main (int argc, char *argv[])
 
   argsDefault (theArgs);
   argsFromParam (theArgs, argc, argv);
+
+  printf("theArgs->varQSizeCnt = %d\n",theArgs->varQSizeCnt);
+
+  for (i = 0; i < theArgs->varQSizeCnt; i++) {
+    printf("theArgs->varQSize = %d\n", theArgs->varQSize[i]);
+  }
+
+  printf("theArgs->queueSize: %d\n", theArgs->queueSize);
+  printf("theArgs->nrOfMsgs: %d\n", theArgs->nrOfMsgs);
+  printf("theArgs->outPath: %s\n", theArgs->outPath);
+  printf("theArgs->outDev: %s\n", theArgs->outDev);
+
   if (0 > argsFromCL (theArgs, argc, argv))
     {
       usage (argv[0]);
@@ -1643,7 +1655,7 @@ main (int argc, char *argv[])
 
          ourTime = time (NULL);
          closeFile ();
-         storeInfoStop (argv[0], ourTime - 2, worker);
+         storeInfoStop (argv[0], ourTime - 2, worker, theArgs);
 
          /* store simple stop run info */
          storeRunInfoStop(ourTime - 2, theArgs, theStats);       
@@ -1684,7 +1696,7 @@ main (int argc, char *argv[])
     {
       closeRESFile (theArgs);
     }
-  storeInfoStop (argv[0], ourTime - 2, worker);
+  storeInfoStop (argv[0], ourTime - 2, worker, theArgs);
 
   /* store simple stop run info */
   storeRunInfoStop(ourTime - 2, theArgs, theStats);