From: hadaq <hadaq>
Date: Thu, 15 Nov 2001 12:46:44 +0000 (+0000)
Subject: evtbuild now puts all parameters at start and all statistics at stop to
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3d06f28960e216d31c9a29b63c2836b873cf62b0;p=daqdata.git

evtbuild now puts all parameters at start and all statistics at stop to
database.
CAUTION: parameter names have changed
BUGFIX in param.tcl (default_p.tcl)
---

diff --git a/hadaq/default_p.tcl b/hadaq/default_p.tcl
index 964d5b4..2e415f2 100644
--- a/hadaq/default_p.tcl
+++ b/hadaq/default_p.tcl
@@ -1,21 +1,21 @@
 set evtbuild(file) ./daq_evtbuild
 set evtbuild(stndln) 0
-set evtbuild(priority) -2
+set evtbuild(prio) -2
 set evtbuild(outdev) file
 set evtbuild(outpath) /tmp
 set evtbuild(expid) ha
 set netmem(file) ./daq_netmem
 set netmem(stndln) 0
-set netmem(priority) -1
+set netmem(prio) -1
 set netmem(inpath0) ATM:0:50
 set netmem(nrofmsgs) 1
 set netmem(verb) debug
 set memnet(file) ./daq_memnet
 set memnet(stndln) 0
-set memnet(priority) -1
+set memnet(prio) -1
 set memnet(outpath) ATM:0:50
 set memnet(bandwidth) 0
 set readout(file) ./daq_readout
 #set readout(wmark) 0
 set readout(stndln) 0
-set readout(priority) -2
+set readout(prio) -2
diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index f7891ba..523851c 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.32 2001-11-15 10:20:18 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.33 2001-11-15 12:46:45 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199506L
@@ -217,30 +217,46 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[]) {
 }
 
 
-static void storeRunInfoStart(const char *name, time_t t, const char *expId, unsigned long runId, const char* fileName) {
-	Param paramS, *param = &paramS;
-	int paramWasFound;
+static void storeInfoStart(const char *n, time_t t, TheArgs *my) {
+	Param pS, *p = &pS;
+	int i;
 	char s[20];
 
-	conSetupParam(param, getenv("DAQ_SETUP"));
+	conSetupParam(p, getenv("DAQ_SETUP"));
+
 	strftime(s, 20, "%Y-%m-%dT%H:%M:%S", localtime(&t));
-	Param_storeString(param, name, "start_date", s);
-	Param_storeString(param, name, "exp_id", expId);
-	Param_storeInt(param, name, "run_id", runId);
-	Param_storeString(param, name, "file_name", fileName);
-	desParam(param);
+	Param_storeString(p, n, "startdate", s);
+	Param_storeInt(p, n, "nrofmsgs", my->nrOfMsgs);
+	for (i = 0; i < NTRIGTYPES; i++) {
+		sprintf(s, "skipmsgs%d", i);
+		Param_storeInt(p, n, s, my->skipMsgs[i]);
+	}
+	for (i = 0; i < my->slowCtrlFileCnt; i++) {
+		sprintf(s, "slwctrlfile%d", i);
+		Param_storeString(p, n, s, my->slowCtrlFiles[i]);
+	}
+	Param_storeString(p, n, "outpath", my->outPath);
+	Param_storeString(p, n, "outdev", my->outDev);
+	Param_storeInt(p, n, "runnr", my->runNr);
+	Param_storeString(p, n, "expid", my->expId);
+	Param_storeInt(p, n, "prio", my->priority);
+	Param_storeInt(p, n, "stndln", my->isStandalone);
+	Param_storeInt(p, n, "qsize", my->queueSize);
+	Param_storeString(p, n, "verb", my->verbosity);
+	desParam(p);
 }
 
-static void storeRunInfoStop(const char *name, time_t t, unsigned long evtsComplete, unsigned long bytesWritten) {
+static void storeInfoStop(const char *name, time_t t, unsigned long evtsDiscarded, unsigned long evtsComplete, unsigned long bytesWritten) {
 	Param paramS, *param = &paramS;
 	int paramWasFound;
 	char s[20];
 
 	conSetupParam(param, getenv("DAQ_SETUP"));
 	strftime(s, 20, "%Y-%m-%dT%H:%M:%S", localtime(&t));
-	Param_storeInt(param, name, "evts_complete", evtsComplete);
-	Param_storeInt(param, name, "bytes_written", bytesWritten);
-	Param_storeString(param, name, "stop_date", s);
+	Param_storeInt(param, name, "evtsdiscarded", evtsDiscarded);
+	Param_storeInt(param, name, "evtscomplete", evtsComplete);
+	Param_storeInt(param, name, "byteswritten", bytesWritten);
+	Param_storeString(param, name, "stopdate", s);
 	desParam(param);
 }
 
@@ -281,7 +297,6 @@ int main(int argc, char *argv[])
 		msglog_usage();
 		exit(EXIT_FAILURE);
 	}
-	argsDump(theArgs);
 
 	/* normalize experiment id */
 	theArgs->expId[0] = tolower(theArgs->expId[0]);
@@ -364,9 +379,12 @@ int main(int argc, char *argv[])
 	evtsDiscarded = Worker_addStatistic(worker, "evtsDiscarded");
 	evtsComplete = Worker_addStatistic(worker, "evtsComplete");
 	bytesWritten = Worker_addStatistic(worker, "bytesWritten");
+
+	argsDump(theArgs);
+	storeInfoStart(argv[0], ourTime, theArgs);
+
 	Worker_initEnd(worker);
 
-	storeRunInfoStart(argv[0], ourTime, theArgs->expId, theArgs->runNr, fileName);
 	evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStart, theArgs->runNr, theArgs->expId);
 	for (i = 0; i < theArgs->slowCtrlFileCnt; i++) {
 		evt = appendFile(evt, theArgs->slowCtrlFiles[i]);
@@ -446,7 +464,7 @@ int main(int argc, char *argv[])
 	Worker_dump(worker, 0);
 
 	ourTime = time(NULL);
-	storeRunInfoStop(argv[0], ourTime, *evtsComplete, *bytesWritten);
+	storeInfoStop(argv[0], ourTime, *evtsDiscarded, *evtsComplete, *bytesWritten);
 
 
 	evt = newEvt(EvtDecoding_64bitAligned, EvtId_runStop, theArgs->runNr, theArgs->expId);