From aa8c17a19a0a33ccca07bb7d40b6d8748fc88489 Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Sun, 2 Mar 2003 16:24:59 +0000
Subject: [PATCH] Joined evtbuild.c BUGFIX from shw-blt branch -- mm
---
hadaq/agent.c | 2 +-
hadaq/ansiTape.c | 1 -
hadaq/ctrlctu.c | 2 +-
hadaq/develog | 87 ++++++++++++++++++++++++++++++++++++++
hadaq/evt.c | 2 +-
hadaq/evtbuild.c | 103 +++++++++++++++++++++++----------------------
hadaq/hadtu.c | 2 +-
hadaq/hadtuqueue.c | 2 +-
hadaq/hldread.c | 2 +-
hadaq/hwrich.c | 2 +-
hadaq/hwsam.c | 2 +-
hadaq/hwsoft.c | 2 +-
hadaq/hwtip.c | 2 +-
hadaq/hwtrig.c | 2 +-
hadaq/memnet.c | 21 +--------
hadaq/netmem.c | 2 +-
hadaq/nettrans.c | 2 +-
hadaq/online.c | 2 +-
hadaq/psxshm.c | 3 +-
hadaq/rc.c | 2 +-
hadaq/readout.c | 2 +-
hadaq/shmtrans.c | 2 +-
hadaq/showevt.c | 2 +-
hadaq/sniff.c | 2 +-
hadaq/subevt.c | 2 +-
hadaq/tclAppInit.c | 2 +-
hadaq/tcldaq.c | 2 +-
hadaq/tkAppInit.c | 2 +-
hadaq/tof_defs.h | 2 +-
hadaq/worker.c | 22 +++++-----
30 files changed, 176 insertions(+), 109 deletions(-)
create mode 100644 hadaq/develog
diff --git a/hadaq/agent.c b/hadaq/agent.c
index 5e427ee..f2640a3 100644
--- a/hadaq/agent.c
+++ b/hadaq/agent.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/agent.c,v 6.11 2003-03-02 15:50:08 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/agent.c,v 6.12 2003-03-02 16:24:59 hadaq Exp $";
#define _GNU_SOURCE
#include <unistd.h>
diff --git a/hadaq/ansiTape.c b/hadaq/ansiTape.c
index ae23864..1aa2d47 100644
--- a/hadaq/ansiTape.c
+++ b/hadaq/ansiTape.c
@@ -1,4 +1,3 @@
-
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/hadaq/ctrlctu.c b/hadaq/ctrlctu.c
index e77221a..1b41be8 100644
--- a/hadaq/ctrlctu.c
+++ b/hadaq/ctrlctu.c
@@ -1,5 +1,5 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.14 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.15 2003-03-02 16:24:59 hadaq Exp $";
#define _XOPEN_SOURCE
#define _POSIX_C_SOURCE 199506L
diff --git a/hadaq/develog b/hadaq/develog
new file mode 100644
index 0000000..d4bd7d6
--- /dev/null
+++ b/hadaq/develog
@@ -0,0 +1,87 @@
+$Header$
+$Log$
+Revision 6.1 2003-03-02 16:24:59 hadaq
+Joined evtbuild.c BUGFIX from shw-blt branch -- mm
+
+Revision 1.1.2.18 2003/03/02 16:08:25 hadaq
+indented, regression test ok -- mm
+
+Revision 1.1.2.17 2003/03/02 14:34:44 hadaq
+CFLAGS=-pg, copy, transport and build only minimum crate events:
+ evtsComplete/s: 256 evtsDiscarded/s: 0 bytesWritten/s: 8192
+ with jitter evtComplete/s approx 230 -> 8.5MByte/s again
+
+Revision 1.1.2.16 2003/03/02 13:56:47 hadaq
+*_2charP functions are performance problem (sprintf without
+honouring the debug level -> put into #ifndef NDEBUG -- mm
+
+Revision 1.1.2.15 2003/03/02 13:31:08 hadaq
+CFLAGS=-pg evtsComplete/s: 167 evtsDiscarded/s: 0 bytesWritten/s: 6193k
+
+Revision 1.1.2.14 2003/03/02 13:21:13 hadaq
+worker put statistic only on stderr, not into syslog
+
+Revision 1.1.2.13 2003/03/02 12:52:17 hadaq
+maxSubEvtSize for one shw ipc is 3088 00000C10 (measured) -- mm
+
+Revision 1.1.2.12 2003/03/02 11:02:00 hadaq
+trigAccepted zeigt unmglich Werte
+
+Revision 1.1.2.11 2003/03/02 09:21:40 hadaq
+Shower crate an/aus:
+ca_test HAD:wi_4_control_send 256 (aus)
+ca_test HAD:wi_4_control_send 768 (an)
+-- mm
+
+Revision 1.1.2.10 2003/03/02 08:39:48 hadaq
+Regression test (Shw debug) successful -- mm
+
+Revision 1.1.2.9 2003/02/23 15:10:31 hadaq
+Still keep crashing now and then, connected to profiling ?
+
+Revision 1.1.2.8 2003/02/23 14:29:00 hadaq
+virtually switched off the rest of the processing (get large se via
+BLT, but transport only headers) 230ev/s 8.5MByte/s
+
+Revision 1.1.2.7 2003/02/23 14:12:32 hadaq
+with memnet 6.5 MByte/s, slower than evtbuildcd ROC!
+
+Revision 1.1.2.6 2003/02/23 14:09:03 hadaq
+memcpy (virtually) switched off (copies only header): 196ev/s 7.6MByte/s
+
+Revision 1.1.2.5 2003/02/23 14:02:56 hadaq
+Recompiled everything -O3 -dNDEBUG, no stable start, but now
+once running. evtComplete/s 170 (6.2MByte/s)
+
+Revision 1.1.2.4 2003/02/23 13:36:42 hadaq
+Was running once with BLT (6MB/s), now crashes readout, tag Exp20030223
+
+Revision 1.1.2.3 2003/02/23 08:25:25 hadaq
+construct and delete bma, normal readout, ok
+
+Revision 1.1.2.2 2003/02/23 08:16:38 hadaq
+Regression Test with version of last saturday ok
+
+Revision 1.1.2.1 2003/02/23 08:14:52 hadaq
+Experiment with CVS as a more general logbook
+
+Sun Feb 23 09:14:06 MET 2003
+Sun Feb 23 09:16:21 MET 2003
+Sun Feb 23 09:23:46 MET 2003
+Sun Feb 23 09:25:23 MET 2003
+Sun Feb 23 14:36:40 MET 2003
+Sun Feb 23 15:01:43 MET 2003
+Sun Feb 23 15:08:20 MET 2003
+Sun Feb 23 15:12:31 MET 2003
+Sun Feb 23 15:27:07 MET 2003
+Sun Feb 23 16:10:07 MET 2003
+Sun Mar 2 09:39:09 MET 2003
+Sun Mar 2 10:19:46 MET 2003
+Sun Mar 2 12:01:59 MET 2003
+Sun Mar 2 13:52:16 MET 2003
+Sun Mar 2 14:21:12 MET 2003
+Sun Mar 2 14:30:55 MET 2003
+Sun Mar 2 14:31:07 MET 2003
+Sun Mar 2 14:56:46 MET 2003
+Sun Mar 2 15:34:43 MET 2003
+Sun Mar 2 17:08:24 MET 2003
diff --git a/hadaq/evt.c b/hadaq/evt.c
index 2f01c04..3482aec 100644
--- 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.13 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.14 2003-03-02 16:24:59 hadaq Exp $";
#define _ANSI_C_SOURCE
diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index ae4d498..daafc49 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.60 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.61 2003-03-02 16:24:59 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
@@ -246,67 +246,68 @@ static void statsDump(TheArgs *theArgs, TheStats *my, int interval)
static unsigned long lastTE;
static unsigned long lastED;
static unsigned long lastBW;
- static time_t lastTime = 0;
- time_t dT;
+ static time_t t0 = 0;
+ time_t t, dT;
int i;
- if (theArgs->isStandalone
- && strcmp(theArgs->verbosity, "info") == 0
- && (dT = (time(NULL) - lastTime)) >= interval
- ) {
- int col = 0;
-
- fputs("==============================================================================\n", stderr);
- fprintf(stderr, "%19s:%6s", "evtsComplete ", unit(*my->evtsComplete));
- fprintf(stderr, "%19s:%6s", "evtsDiscarded ", unit(*my->evtsDiscarded));
- fprintf(stderr, "%19s:%6s", "bytesWritten ", unit(*my->bytesWritten));
- fputc('\n', stderr);
- fprintf(stderr, "%19s:%6s", "evtsDataError ", unit(*my->evtsDataError));
- fprintf(stderr, "%19s:%6s", "evtsTagError ", unit(*my->evtsTagError));
- fputc('\n', stderr);
-
- fprintf(stderr, "%19s:%6s", "evtsComplete/s", unit(*my->evtsComplete - lastEC));
- fprintf(stderr, "%19s:%6s", "evtsDiscarded/s", unit(*my->evtsDiscarded - lastED));
- fprintf(stderr, "%19s:%6s", "bytesWritten/s", unit(*my->bytesWritten - lastBW));
- fputc('\n', stderr);
- fprintf(stderr, "%19s:%6s", "evtsDataError/s", unit(*my->evtsDataError - lastEE));
- fprintf(stderr, "%19s:%6s", "evtsTagError/s", unit(*my->evtsTagError - lastTE));
- fputc('\n', stderr);
- lastEC = *my->evtsComplete;
- lastEE = *my->evtsDataError;
- lastTE = *my->evtsTagError;
- lastED = *my->evtsDiscarded;
- lastBW = *my->bytesWritten;
-
- fputs("------------------------------------------------------------------------------\n", stderr);
- col = 0;
- for (i = 0; i < NEVTIDS; i++) {
- if (*my->evtId[i] != 0) {
- fprintf(stderr, "%17s%02x:%6s", "evtId", i, unit(*my->evtId[i]));
+ if (theArgs->isStandalone && strcmp(theArgs->verbosity, "info") == 0) {
+ t = time(NULL);
+ dT = t - t0;
+ if (dT >= interval) {
+ int col = 0;
+
+ fputs("==============================================================================\n", stderr);
+ fprintf(stderr, "%19s:%6s", "evtsComplete ", unit(*my->evtsComplete));
+ fprintf(stderr, "%19s:%6s", "evtsDiscarded ", unit(*my->evtsDiscarded));
+ fprintf(stderr, "%19s:%6s", "bytesWritten ", unit(*my->bytesWritten));
+ fputc('\n', stderr);
+ fprintf(stderr, "%19s:%6s", "evtsDataError ", unit(*my->evtsDataError));
+ fprintf(stderr, "%19s:%6s", "evtsTagError ", unit(*my->evtsTagError));
+ fputc('\n', stderr);
+
+ fprintf(stderr, "%19s:%6s", "evtsComplete/s", unit((*my->evtsComplete - lastEC) / dT));
+ fprintf(stderr, "%19s:%6s", "evtsDiscarded/s", unit((*my->evtsDiscarded - lastED) / dT));
+ fprintf(stderr, "%19s:%6s", "bytesWritten/s", unit((*my->bytesWritten - lastBW) / dT));
+ fputc('\n', stderr);
+ fprintf(stderr, "%19s:%6s", "evtsDataError/s", unit((*my->evtsDataError - lastEE) / dT));
+ fprintf(stderr, "%19s:%6s", "evtsTagError/s", unit((*my->evtsTagError - lastTE) / dT));
+ fputc('\n', stderr);
+ lastEC = *my->evtsComplete;
+ lastEE = *my->evtsDataError;
+ lastTE = *my->evtsTagError;
+ lastED = *my->evtsDiscarded;
+ lastBW = *my->bytesWritten;
+
+ fputs("------------------------------------------------------------------------------\n", stderr);
+ col = 0;
+ for (i = 0; i < NEVTIDS; i++) {
+ if (*my->evtId[i] != 0) {
+ fprintf(stderr, "%17s%02x:%6s", "evtId", i, unit(*my->evtId[i]));
+ if (++col == 3) {
+ fputc('\n', stderr);
+ col = 0;
+ }
+ }
+ }
+ if (col != 0) {
+ fputc('\n', stderr);
+ }
+ col = 0;
+
+ fputs("------------------------------------------------------------------------------\n", stderr);
+ for (i = 0; i < theArgs->nrOfMsgs; i++) {
+ fprintf(stderr, "%12s%02d: 0x%08x", "trigNr", i, *my->trigNr[i]);
if (++col == 3) {
fputc('\n', stderr);
col = 0;
}
}
- }
- if (col != 0) {
- fputc('\n', stderr);
- }
- col = 0;
-
- fputs("------------------------------------------------------------------------------\n", stderr);
- for (i = 0; i < theArgs->nrOfMsgs; i++) {
- fprintf(stderr, "%12s%02d: 0x%08x", "trigNr", i, *my->trigNr[i]);
- if (++col == 3) {
+ if (col != 0) {
fputc('\n', stderr);
- col = 0;
}
+ t0 = t;
}
- if (col != 0) {
- fputc('\n', stderr);
- }
- lastTime += dT;
}
}
diff --git a/hadaq/hadtu.c b/hadaq/hadtu.c
index 1c94519..e82c951 100644
--- a/hadaq/hadtu.c
+++ b/hadaq/hadtu.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.5 2003-03-02 16:24:59 hadaq Exp $";
#define _ANSI_C_SOURCE
diff --git a/hadaq/hadtuqueue.c b/hadaq/hadtuqueue.c
index 810a6f3..2f92a5c 100644
--- a/hadaq/hadtuqueue.c
+++ b/hadaq/hadtuqueue.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtuqueue.c,v 6.4 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtuqueue.c,v 6.5 2003-03-02 16:24:59 hadaq Exp $";
#define _ANSI_C_SOURCE
diff --git a/hadaq/hldread.c b/hadaq/hldread.c
index 93c33a6..93e0279 100644
--- 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.6 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.7 2003-03-02 16:24:59 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index bee3684..7e59c22 100644
--- a/hadaq/hwrich.c
+++ b/hadaq/hwrich.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.38 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.39 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#include <unistd.h>
diff --git a/hadaq/hwsam.c b/hadaq/hwsam.c
index 8c4f841..ca62b5d 100644
--- a/hadaq/hwsam.c
+++ b/hadaq/hwsam.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.17 2003-03-02 15:50:09 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.18 2003-03-02 16:25:00 hadaq Exp $";
#include <assert.h>
#include <string.h>
diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index d91a75f..5108532 100644
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.27 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.28 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c
index 34dda17..888e39d 100644
--- a/hadaq/hwtip.c
+++ b/hadaq/hwtip.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.29 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.30 2003-03-02 16:25:00 hadaq Exp $";
#include <assert.h>
#include <string.h>
diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index 4b717a0..d486a94 100644
--- a/hadaq/hwtrig.c
+++ b/hadaq/hwtrig.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.35 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.36 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#include <unistd.h>
diff --git a/hadaq/memnet.c b/hadaq/memnet.c
index 7ded82e..301862a 100644
--- a/hadaq/memnet.c
+++ b/hadaq/memnet.c
@@ -1,23 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.16 2003-03-02 15:50:10 hadaq Exp $";
-
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.17 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#define SYSLOG_NAMES
diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 6072501..52bf1e4 100644
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.24 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.25 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index 4ab8489..989987f 100644
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.26 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.27 2003-03-02 16:25:00 hadaq Exp $";
#define _GNU_SOURCE
diff --git a/hadaq/online.c b/hadaq/online.c
index 7009a2a..3cea679 100644
--- a/hadaq/online.c
+++ b/hadaq/online.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.7 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.8 2003-03-02 16:25:00 hadaq Exp $";
#define _GNU_SOURCE
diff --git a/hadaq/psxshm.c b/hadaq/psxshm.c
index 8f11ff0..8516e20 100644
--- a/hadaq/psxshm.c
+++ b/hadaq/psxshm.c
@@ -1,5 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/psxshm.c,v 6.4 2002-10-09 12:42:18 hadaq Exp $";
-
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/psxshm.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#include <unistd.h>
diff --git a/hadaq/rc.c b/hadaq/rc.c
index 23b3356..89d34ab 100644
--- a/hadaq/rc.c
+++ b/hadaq/rc.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
#include <stdlib.h>
diff --git a/hadaq/readout.c b/hadaq/readout.c
index 9c7803d..ee7896d 100644
--- a/hadaq/readout.c
+++ b/hadaq/readout.c
@@ -1,5 +1,5 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.25 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.26 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#define SYSLOG_NAMES
diff --git a/hadaq/shmtrans.c b/hadaq/shmtrans.c
index 13f6cbc..2974fe0 100644
--- a/hadaq/shmtrans.c
+++ b/hadaq/shmtrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.7 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.8 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
diff --git a/hadaq/showevt.c b/hadaq/showevt.c
index cc5bec9..fe5c519 100644
--- a/hadaq/showevt.c
+++ b/hadaq/showevt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.8 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.9 2003-03-02 16:25:00 hadaq Exp $";
#define _ANSI_C_SOURCE
diff --git a/hadaq/sniff.c b/hadaq/sniff.c
index 1b52a39..71ff686 100644
--- a/hadaq/sniff.c
+++ b/hadaq/sniff.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.8 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.9 2003-03-02 16:25:00 hadaq Exp $";
#define SYSLOG_NAMES
diff --git a/hadaq/subevt.c b/hadaq/subevt.c
index 731e755..7f6aba3 100644
--- a/hadaq/subevt.c
+++ b/hadaq/subevt.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.10 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.11 2003-03-02 16:25:00 hadaq Exp $";
#include <stdlib.h>
diff --git a/hadaq/tclAppInit.c b/hadaq/tclAppInit.c
index 043ef44..8001659 100644
--- a/hadaq/tclAppInit.c
+++ b/hadaq/tclAppInit.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tclAppInit.c,v 6.4 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tclAppInit.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
/*
diff --git a/hadaq/tcldaq.c b/hadaq/tcldaq.c
index 053fd90..d6e32c3 100644
--- a/hadaq/tcldaq.c
+++ b/hadaq/tcldaq.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.12 2003-03-02 15:50:10 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.13 2003-03-02 16:25:00 hadaq Exp $";
#define _GNU_SOURCE
#include <unistd.h>
diff --git a/hadaq/tkAppInit.c b/hadaq/tkAppInit.c
index 6f3e692..8bbadba 100644
--- a/hadaq/tkAppInit.c
+++ b/hadaq/tkAppInit.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tkAppInit.c,v 6.4 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tkAppInit.c,v 6.5 2003-03-02 16:25:00 hadaq Exp $";
/*
diff --git a/hadaq/tof_defs.h b/hadaq/tof_defs.h
index 4787d32..20c4e08 100644
--- a/hadaq/tof_defs.h
+++ b/hadaq/tof_defs.h
@@ -2,7 +2,7 @@
/**** Headerfile for TOF-IPU registers */
/**** created: E.Lins 13-Jan-2000 */
-/* $Id: tof_defs.h,v 1.4 2003-03-02 15:50:10 hadaq Exp $ */
+/* $Id: tof_defs.h,v 1.5 2003-03-02 16:25:00 hadaq Exp $ */
/* $Source: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/tof_defs.h,v $ */
diff --git a/hadaq/worker.c b/hadaq/worker.c
index 29649c8..279377e 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.18 2003-03-02 15:50:11 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.19 2003-03-02 16:25:00 hadaq Exp $";
#define _POSIX_C_SOURCE 199309L
#include <unistd.h>
@@ -12,6 +12,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
#include <sched.h>
#include <setjmp.h>
#include <signal.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
@@ -128,8 +129,7 @@ static int removeSigHandlers(Worker *my)
| sigaction(my->signal1, my->oldSigAction1, NULL);
}
-static int installSigHandlers(Worker *my, int s0, int s1,
- void (*sigHandler) (int))
+static int installSigHandlers(Worker *my, int s0, int s1, void (*sigHandler) (int))
{
int retVal;
struct sigaction actS, *act = &actS;
@@ -313,11 +313,12 @@ char *Worker_status(const char *name)
retVal = NULL;
} else {
strcpy(buf, "{}");
- for (i = 0, p = buf;
- 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);
+ for (
+ i = 0, p = buf;
+ 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);
}
closeStatShm(my);
retVal = buf;
@@ -377,14 +378,13 @@ void Worker_dump(Worker *my, time_t interval)
curTime = time(NULL);
if (curTime >= lastTime + interval) {
- syslog(LOG_INFO, "%s", Worker_status(my->name));
+ fprintf(stderr, "%s\n", Worker_status(my->name));
lastTime = curTime;
}
}
}
-int Worker_getStatistic(const char *name, const char *stat,
- unsigned long int *value)
+int Worker_getStatistic(const char *name, const char *stat, unsigned long int *value)
{
int retVal = -1;
int i;
--
2.43.0