From ff4c97358b756ab3932c69c5232750eac8b573e1 Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 27 Feb 2002 13:20:31 +0000 Subject: [PATCH] some minor changes in output of evtbuild --- hadaq/evtbuild.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 7921e3a..9f568ef 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.37 2002-02-27 12:53:19 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.38 2002-02-27 13:20:31 hadaq Exp $"; #define _POSIX_C_SOURCE 199506L @@ -247,64 +247,57 @@ static void statsDump(TheArgs *theArgs, TheStats *my, int interval) { static unsigned long lastED; static unsigned long lastBW; static time_t lastTime = 0; - time_t dT = time(NULL) - lastTime; + time_t dT; int i; - if (theArgs->isStandalone && dT >= interval) { + if (theArgs->isStandalone + && strcmp(theArgs->verbosity, "info") == 0 + && (dT = (time(NULL) - lastTime)) >= interval + ) { int col = 0; - int row = 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'); - row++; - 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'); - row++; lastEC = *my->evtsComplete; lastED = *my->evtsDiscarded; lastBW = *my->bytesWritten; + puts("------------------------------------------------------------------------------"); col = 0; for (i = 0; i < NTRIGTYPES; i++) { if (*my->triggerType[i] != 0) { printf("%17s%02d:%6s", "triggerType", i, unit(*my->triggerType[i])); if (++col == 3) { putchar('\n'); - row++; col = 0; } } } if (col != 0) { putchar('\n'); - row++; } col = 0; + puts("------------------------------------------------------------------------------"); for (i = 0; i < theArgs->nrOfMsgs; i++) { printf("%12s%02d: 0x%08x", "trigNr", i, *my->trigNr[i]); if (++col == 3) { putchar('\n'); - row++; col = 0; } } if (col != 0) { putchar('\n'); - row++; - } - while(row < 23) { - putchar('\n'); - row++; } - lastTime += dT; } -- 2.43.0