From: hadaq <hadaq>
Date: Thu, 7 Nov 2002 12:48:49 +0000 (+0000)
Subject: More trigger types in statistics -- mm
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5095e72e4bad89fdf50c19787704a7084b81f13b;p=daqdata.git

More trigger types in statistics -- mm
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 66ef9a9..3e34bb8 100644
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.48 2002-10-23 15:24:49 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.49 2002-11-07 12:48:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -30,7 +30,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include "shmtrans.h"
 #include "ansiTape.h"
 
-#define NTRIGTYPES 16
+#define NTRIGTYPES 64UL  /* must be 2^n */
 
 static time_t ourTime;
 
@@ -268,7 +268,7 @@ static void statsDump(TheArgs *theArgs, TheStats *my, int interval) {
 		col = 0;
 		for (i = 0; i < NTRIGTYPES; i++) {
 			if (*my->triggerType[i] != 0) {
-				fprintf(stderr, "%17s%02d:%6s", "triggerType", i, unit(*my->triggerType[i]));
+				fprintf(stderr, "%17s%02x:%6s", "triggerType", i, unit(*my->triggerType[i]));
 				if (++col == 3) {
 					fputc('\n', stderr);
 					col = 0;
@@ -562,7 +562,7 @@ int main(int argc, char *argv[])
 			if (Evt_dataError(evt)) {
 				(*theStats->evtsDataError)++;
 			}
-			(*theStats->triggerType[currId])++;
+			(*theStats->triggerType[currId & (NTRIGTYPES - 1)])++;
 			(*theStats->bytesWritten) += Evt_size(evt);
 		} else {
 			(*theStats->evtsDiscarded)++;
diff --git a/hadaq/worker.c b/hadaq/worker.c
index 72f4360..31103fc 100644
--- a/hadaq/worker.c
+++ b/hadaq/worker.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.13 2002-10-09 12:42:19 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.14 2002-11-07 12:48:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -313,9 +313,7 @@ unsigned long *Worker_addStatistic(Worker *my, const char *name)
 	for (i = 0; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
 	}
 	if (i == WORKER_MAX_NUM_STATS) {
-		errno = ENOSPC;
-		syslog(LOG_DEBUG,
-			   "%s:%d: %s", __FILE__, __LINE__, "Too many statistics");
+		syslog(LOG_ERR, "%s:%d: %s", __FILE__, __LINE__, "Too many statistic counters");
 		retVal = NULL;
 	} else {
 		strcpy(my->statistics[i].name, name);