Need more statistics for many SEB

diff --git a/hadaq/worker.c b/hadaq/worker.c
index f53ff6ad370dcad6c5e23ce4d38433f8bcfe0b63..2e5ef1b7ec95b1633167f260c1b25339fb4805a2 100644 (file)
--- 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.11 2001-11-15 12:59:54 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.12 2001-11-21 21:51:05 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -64,7 +64,7 @@ static int createStatShm(Worker *my)
                syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
                retVal = -1;
        } else {
-               my->shm = PsxShm_open(ipcName, O_CREAT | O_RDWR, S_IRWXU, 32 * sizeof(Statistic));
+               my->shm = PsxShm_open(ipcName, O_CREAT | O_RDWR, S_IRWXU, WORKER_MAX_NUM_STATS * sizeof(Statistic));
                if (NULL == my->shm) {
                        syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
                        retVal = -1;
@@ -104,7 +104,7 @@ static int openStatShm(Worker *my)
        ipcName = basename(ipcNameS);
        strcat(ipcName, ".shm");
 
-       my->shm = PsxShm_open(ipcName, O_RDWR, 0, 32 * sizeof(Statistic));
+       my->shm = PsxShm_open(ipcName, O_RDWR, 0, WORKER_MAX_NUM_STATS * sizeof(Statistic));
        if (NULL == my->shm) {
                syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
                retVal = -1;
@@ -264,7 +264,7 @@ char *Worker_status(const char *name)
 {
        char *retVal;
        Worker myS, *my = &myS;
-       static char buf[32 * 80];
+       static char buf[WORKER_MAX_NUM_STATS * 80];
        char *p;
        int i;
 
@@ -277,7 +277,7 @@ char *Worker_status(const char *name)
                strcpy(buf, "{}");
                for (
                                i = 0, p = buf;
-                               i < 32 && strcmp(my->statistics[i].name, "") != 0;
+                               i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0;
                                i++) {
                        p += sprintf(p,
                          "{ %s %lu } ", my->statistics[i].name, my->statistics[i].value);
@@ -311,9 +311,9 @@ unsigned long *Worker_addStatistic(Worker *my, const char *name)
        unsigned long *retVal;
        int i;
 
-       for (i = 0; i < 32 && strcmp(my->statistics[i].name, "") != 0; i++) {
+       for (i = 0; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
        }
-       if (i == 32) {
+       if (i == WORKER_MAX_NUM_STATS) {
                errno = ENOSPC;
                syslog(LOG_DEBUG,
                           "%s:%d: %s", __FILE__, __LINE__, "Too many statistics");

diff --git a/hadaq/worker.h b/hadaq/worker.h
index 6df883524e4ab10c31278568d38eb7724ad51f38..d71a41ebd9aa817383abbca2abd3f24476649f1b 100644 (file)
--- a/hadaq/worker.h
+++ b/hadaq/worker.h
@@ -6,7 +6,7 @@
 
 #include "psxshm.h"
 
-#define WORKER_MAX_NUM_STATS 40
+#define WORKER_MAX_NUM_STATS 80
 
 typedef struct StatisticS {
        char name[256];