EVT_MAXSIZE increased from 256KB to 1MB. Sergey.

diff --git a/hadaq/evt.c b/hadaq/evt.c
index 615b59548110ae2f94eb47751d79be18957af7ad..23025f81b6d8e50c67af44c6c966ee700b8f2314 100644 (file)
--- a/hadaq/evt.c
+++ b/hadaq/evt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.17 2003-05-14 13:54:42 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.18 2010-01-29 18:24:02 hadaq Exp $";
 
 
 #define _ANSI_C_SOURCE
@@ -178,7 +178,6 @@ void *newEvt(uint32_t decoding, uint32_t id)
        struct tm *gmTime;
        uint32_t dummy;
 
-
        my = malloc(EVT_MAXSIZE);
 
        Evt_setSize(my, Evt_hdrSize());

diff --git a/hadaq/evt.h b/hadaq/evt.h
index 237b0265af889f7c93de021f2a7a79e56927ce3a..5f0577e8dcd9deafa5f06713a02358833dc0d833 100644 (file)
--- a/hadaq/evt.h
+++ b/hadaq/evt.h
@@ -10,7 +10,7 @@
 #include "hadtu.h"
 #include "subevt.h"
 
-#define EVT_MAXSIZE (256 * 1024)
+#define EVT_MAXSIZE (1024 * 1024)
 
 static const int evtBlockSize = 8 * 1024;
 

diff --git a/hadaq/hldread.c b/hadaq/hldread.c
index 4260809c596f515e2b9d4b8c989326c71b73748b..843100bc424b9cd28e2478eb24cb2264e090a904 100644 (file)
--- a/hadaq/hldread.c
+++ b/hadaq/hldread.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.9 2007-04-14 21:49:37 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.10 2010-01-29 18:24:05 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -106,23 +106,16 @@ int main(int argc, char *argv[])
                        analArgv[analArgc++] = optarg;
                        break;
                case 'v':
-                       for (i = 0; prioritynames[i].c_name != NULL
-                                && 0 != strcmp(prioritynames[i].c_name, optarg); i++) {
+                       for (i = 0; prioritynames[i].c_name != NULL && 0 != strcmp(prioritynames[i].c_name, optarg); i++) {
                        }
                        if (prioritynames[i].c_name != NULL) {
                                setlogmask(LOG_UPTO(prioritynames[i].c_val));
                                break;
                        }                                       /* FALLTHROUGH to default */
                default:
-                       syslog(
-                                         LOG_ERR,
-                                         "Usage: %s -f firstEvent -n numEvents -e echoRate",
-                                         argv[0]
-                               );
-                       syslog(
-                                         LOG_ERR,
-                                         "-t timeout -o analArgs -x (excludeAnal) [fileName]"
+                       syslog(LOG_ERR, "Usage: %s -f firstEvent -n numEvents -e echoRate", argv[0]
                                );
+                       syslog(LOG_ERR, "-t timeout -o analArgs -x (excludeAnal) [fileName]");
                        exit(EXIT_FAILURE);
                        break;
                }                                               /* switch (i ... */
@@ -150,6 +143,7 @@ int main(int argc, char *argv[])
        signal(SIGALRM, alarmHandler);
        alarm(timeout);
 
+
        while ((evt = Evt_fget(file)) != NULL && processedEvts < nEvts) {
                readEvts++;
                if (readEvts >= fEvts) {