BUGFIX It is possible to send the hld data to stdout. So the screen output

must not interfere with this.
-- mm

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 7d89d8c327a53f32f8766cf5cbe9149e49a1dafb..9f09be4963d2ed503128302c4a9ebf2b3335ef89 100644 (file)
--- 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.43 2002-10-09 12:42:17 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.44 2002-10-17 11:14:42 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -244,15 +244,15 @@ static void statsDump(TheArgs *theArgs, TheStats *my, int interval) {
                int col = 0;
 
                puts("==============================================================================");
-               printf("%19s:%6s", "evtsComplete  ", unit(*my->evtsComplete));
-               printf("%19s:%6s", "evtsDiscarded  ", unit(*my->evtsDiscarded));
-               printf("%19s:%6s", "bytesWritten  ", unit(*my->bytesWritten));
-               putchar('\n');
-
-               printf("%19s:%6s", "evtsComplete/s", unit(*my->evtsComplete - lastEC));
-               printf("%19s:%6s", "evtsDiscarded/s", unit(*my->evtsDiscarded - lastED));
-               printf("%19s:%6s", "bytesWritten/s", unit(*my->bytesWritten - lastBW));
-               putchar('\n');
+               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", "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);
                lastEC = *my->evtsComplete;
                lastED = *my->evtsDiscarded;
                lastBW = *my->bytesWritten;
@@ -261,28 +261,28 @@ static void statsDump(TheArgs *theArgs, TheStats *my, int interval) {
                col = 0;
                for (i = 0; i < NTRIGTYPES; i++) {
                        if (*my->triggerType[i] != 0) {
-                               printf("%17s%02d:%6s", "triggerType", i, unit(*my->triggerType[i]));
+                               fprintf(stderr, "%17s%02d:%6s", "triggerType", i, unit(*my->triggerType[i]));
                                if (++col == 3) {
-                                       putchar('\n');
+                                       fputc('\n', stderr);
                                        col = 0;
                                }
                        }
                }
                if (col != 0) {
-                       putchar('\n');
+                       fputc('\n', stderr);
                }
                col = 0;
 
                puts("------------------------------------------------------------------------------");
                for (i = 0; i < theArgs->nrOfMsgs; i++) {
-                       printf("%12s%02d: 0x%08x", "trigNr", i, *my->trigNr[i]);
+                       fprintf(stderr, "%12s%02d: 0x%08x", "trigNr", i, *my->trigNr[i]);
                        if (++col == 3) {
-                               putchar('\n');
+                               fputc('\n', stderr);
                                col = 0;
                        }
                }
                if (col != 0) {
-                       putchar('\n');
+                       fputc('\n', stderr);
                }
 
                lastTime += dT;

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 3004f8283f37cb479b884b862f1277170f9aa240..720d37df638b6fc11bbdbef4738ec6892b6d3a46 100644 (file)
--- 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.20 2002-10-09 12:42:18 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.21 2002-10-17 11:14:42 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -143,21 +143,21 @@ static void statsDump(TheArgs *theArgs, NetTrans **my, int interval) {
        ) {
                puts("==============================================================================");
                for (i = 0; i < theArgs->nrOfMsgs; i++) {
-                       printf("%17s%02d:%6s",
+                       fprintf(stderr, "%17s%02d:%6s",
                                "pktsReceived", i, unit(*my[i]->pktsReceived));
-                       printf("%17s%02d:%6s",
+                       fprintf(stderr, "%17s%02d:%6s",
                                "pktsDiscarded", i, unit(*my[i]->pktsDiscarded));
-                       printf("%15s%02d  :%6s",
+                       fprintf(stderr, "%15s%02d  :%6s",
                                "bytesReceived", i, unit(*my[i]->bytesReceived));
-                       putchar('\n');
-                       printf("%17s%02d:%6s",
+                       fputc('\n', stderr);
+                       fprintf(stderr, "%17s%02d:%6s",
                                "msgsReceived", i, unit(*my[i]->msgsReceived));
-                       printf("%17s%02d:%6s",
+                       fprintf(stderr, "%17s%02d:%6s",
                                "msgsDiscarded", i, unit(*my[i]->msgsDiscarded));
-                       printf("%15s%02d/s:%6s",
+                       fprintf(stderr, "%15s%02d/s:%6s",
                                "bytesReceived", i, unit(*my[i]->bytesReceived - lastBR[i]));
                        lastBR[i] = *my[i]->bytesReceived;
-                       putchar('\n');
+                       fputc('\n', stderr);
                        puts("------------------------------------------------------------------------------");
                }
                lastTime += dT;