From: sailer <sailer>
Date: Wed, 9 Jul 2003 11:34:34 +0000 (+0000)
Subject: Bugfix.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=00d4cfdf72b510d3b3c05dd1578a928cf678a0de;p=daqdata.git

Bugfix.
	-- Benjamin Sailer
---

diff --git a/allParam/ca/server/paramServer.cc b/allParam/ca/server/paramServer.cc
index d577e23..88642a1 100644
--- a/allParam/ca/server/paramServer.cc
+++ b/allParam/ca/server/paramServer.cc
@@ -1,5 +1,5 @@
 static const char rcsId[] =
-	"$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramServer.cc,v 1.7 2003-05-19 16:05:41 sailer Exp $";
+	"$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramServer.cc,v 1.8 2003-07-09 11:34:34 sailer Exp $";
 #define _POSIX_C_SOURCE 199506L
 #define SYSLOG_NAMES
 
@@ -14,6 +14,7 @@ extern int optind, opterr, optopt;
 #include <unistd.h>
 
 #include <ctype.h>
+#include <signal.h>
 #include <string.h>
 #include <syslog.h>
 }
@@ -22,6 +23,13 @@ extern int optind, opterr, optopt;
 
 #include "paramRecordSet.h"
 
+#ifndef NDEBUG
+static void profSignalHandler(int sig)
+{
+	exit(sig);
+}
+#endif /* NDEBUG */
+
 static const char *ourBasename(const char *s)
 {
 	const char *p;
@@ -57,6 +65,12 @@ int main(int argc, char *argv[])
 	int val;
 	char *verbosity = NULL;
 
+#ifndef NDEBUG
+	signal(SIGQUIT, profSignalHandler);
+	signal(SIGTERM, profSignalHandler);
+	signal(SIGINT, profSignalHandler);
+#endif /* NDEBUG */
+
 	while((val = getopt(argc, argv, "dhv:w:")) != -1) {
 		switch(val) {
 			case('d'):
diff --git a/allParam/ca/server/record.cc b/allParam/ca/server/record.cc
index d7208f7..d7f0969 100644
--- a/allParam/ca/server/record.cc
+++ b/allParam/ca/server/record.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.6 2003-05-19 16:30:48 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.7 2003-07-09 11:34:34 sailer Exp $";
 #define _POSIX_C_SOURCE 199506L
 
 #if HAVE_CONFIG_H
@@ -49,7 +49,7 @@ Record::Record(caServer &cas, const Param *p, const char *n, const char *u, aitE
 
 	recordScanTimer = new scanTimer(*this);
 #if EPICS_RELEASE >= 314
-	timer.start(*recordScanTimer, 1.0);
+	timer.start(*recordScanTimer, 100.0);
 #endif
 }
 
@@ -178,7 +178,7 @@ gddAppFuncTableStatus Record::readPrecision(gdd &value)
 #if EPICS_RELEASE >= 314
 scanTimer::scanTimer (Record &pv) : procVar(pv)
 #else
-scanTimer::scanTimer (Record &pv) : osiTimer(1.0), procVar(pv)
+scanTimer::scanTimer (Record &pv) : osiTimer(100.0), procVar(pv)
 #endif
 {
 }
@@ -187,7 +187,7 @@ scanTimer::scanTimer (Record &pv) : osiTimer(1.0), procVar(pv)
 epicsTimerNotify::expireStatus scanTimer::expire(const epicsTime &t)
 {
 	procVar.scan();
-	return expireStatus(restart, 1.0);
+	return expireStatus(restart, 100.0);
 }
 #else
 void scanTimer::expire()
diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index d3a65b8..de21429 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.35 2003-07-09 11:19:39 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.36 2003-07-09 11:34:34 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -192,7 +192,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 					INTO
 						:value
 					FROM
-						daq.runctrl_param_int_all_cache
+						daq.param_int_all_cache
 					WHERE
 							setup = :sqlsetup
 						AND
@@ -226,7 +226,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 					INTO
 						:value
 					FROM
-						daq.runctrl_param_int_all_cache
+						daq.param_int_all_cache
 					WHERE
 							setup IS NULL
 						AND
@@ -403,7 +403,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 					INTO
 						:intvalue
 					FROM
-						daq.runctrl_param_int_all_cache
+						daq.param_int_all_cache
 					WHERE
 							setup = :sqlsetup
 						AND
@@ -437,7 +437,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 					INTO
 						:intvalue
 					FROM
-						daq.runctrl_param_int_all_cache
+						daq.param_int_all_cache
 					WHERE
 							setup IS NULL
 						AND