From: hadaq <hadaq>
Date: Fri, 5 Aug 2011 08:31:39 +0000 (+0000)
Subject: Changed message timeout for getRunId to 600s instead 2s.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=d789784c9b8d2d4a635b70dfbb27cece02ad6826;p=daqdata.git

Changed message timeout for getRunId to 600s instead 2s.
Bugfix in rfio: when "no file" (-d null) was specified at startup, rfio was opened and written anyway. JAM (Joern Adamczewski-Musch)
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index ae54789..5fb2bf7 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.146 2011-04-12 16:34:40 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.147 2011-08-05 08:31:39 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -52,6 +52,8 @@ static RFILE *fRemote = NULL;
 #define MAXINPATH 100
 #define DAQVERSION 2			/* needed by Hydra unpackers */
 
+#define RUNID_INFO_DT  600		/* time in s until not available runid info is logged  */
+
 #define NEVTIDS 64UL			/* must be 2^n */
 #define NEVTIDS_IN_FILE 0UL		/* must be 2^n */
 
@@ -252,6 +254,7 @@ unsigned long getRunId(TheArgs *my)
 {
 	unsigned long myRunId = 0;
 	char buf[_POSIX_PATH_MAX];
+	char msg[256];
 	struct timespec tv = { 0, 1e+8 };
 
 	static time_t t0 = 0;
@@ -270,9 +273,10 @@ unsigned long getRunId(TheArgs *my)
 			if (myRunId == 0) {
 				t = time(NULL);
 				dT = t - t0;
-				if (dT > 2) {
-					storeLogInfo(my, "<I> getRunId: Still waiting for runId from EPICS IOC...");
-					printf("Still waiting for runId from EPICS IOC...\n");
+				if (dT > RUNID_INFO_DT) {
+					snprintf(msg, 255, "<I> getRunId: Still waiting for runId from EPICS IOC after %d s...", dT);
+					storeLogInfo(my, msg);
+					printf("%s \n", msg);
 					t0 = t;
 				}
 
@@ -770,6 +774,12 @@ static int closeFile(TheArgs *theArgs)
 #ifdef RFIO
 static int rfio_openConnection(TheArgs *theArgs, TheStats *theStats)
 {
+	/* JAM: disable rfio when option "no file" is set */
+	if (strcmp(theArgs->outDev, "null") == 0) {
+		storeLogInfo(theArgs, "<I> NO FILE - rfio is disabled");
+		fRemote = NULL;
+		return 0;
+	}
 
 	if ((strcmp(theArgs->rfioRemotePath, "") != 0)) {
 		char rfioBase[128] = "";