From 596a41c2fe095b2a45a41a6116b23d51169916fb Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Wed, 22 Feb 2012 13:54:48 +0000
Subject: [PATCH] JAM: improved lost event statistics, not tested yet removed
 debug output of first events trig id

---
 hadaq/evtbuild.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 2a40d0b..b27b7ee 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.157 2011-11-28 11:52:08 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.158 2012-02-22 13:54:48 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -61,7 +61,7 @@ static RFILE *fRemote = NULL;
 #define QUEUE_FLUSH_FAST 1
 
 /*define this to get log output of first 10 triggernumbers*/
-#define TRIGNO_DEBUG 1
+/*#define TRIGNO_DEBUG 1*/
 
 #define NEVTIDS 64UL			/* must be 2^n */
 #define NEVTIDS_IN_FILE 0UL		/* must be 2^n */
@@ -894,7 +894,10 @@ int main(int argc, char *argv[])
 	uint32_t currTrigTag;
 	uint32_t currId;
 
-	uint32_t failTrigNr = 0;
+	uint32_t lastTrigNr = 0;
+
+
+
 
 	signal(SIGINT, sigHandler);
 	signal(SIGTERM, sigHandler);
@@ -1458,6 +1461,7 @@ int main(int argc, char *argv[])
 			}
 
 			(*theStats->evtsComplete)++;
+			lastTrigNr = currTrigNr;	/* note last complete event id for loss stats JAM */
 
 			(*theStats->evtId[currId & (NEVTIDS - 1)])++;
 			Evt_setId(evt, currId & (NEVTIDS_IN_FILE - 1));
@@ -1497,8 +1501,17 @@ int main(int argc, char *argv[])
 			if (theArgs->online)
 				Evt_online(evt);
 		} else {
-			(*theStats->evtsDiscarded)++;
-
+			if (lastTrigNr) {
+				/* check how many events we did lose since last complete one: */
+				(*theStats->evtsDiscarded) += currTrigNr - lastTrigNr;
+				sprintf(msglog, "<I> Discarded %d events at TrigNr: 0x%06x", currTrigNr - lastTrigNr, currTrigNr);
+				storeLogInfo(theArgs, msglog);
+				lastTrigNr = 0;
+			} else {
+				sprintf(msglog, "<W> Found No valid last trigger nr at TrigNr: 0x%06x", currTrigNr);
+				storeLogInfo(theArgs, msglog);
+				(*theStats->evtsDiscarded)++;
+			}
 			/* Check if triger mismatch is large enough to exit */
 			if (isMismatchCritical(theArgs, theStats)) {
 				Debug_printBrokenTrigMismatch(theArgs, theStats);
-- 
2.43.0