From: hades <hades>
Date: Mon, 2 Jul 2001 11:58:44 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=98e4c2d725a6b9231c69df493f26bb5e13faf342;p=daqdata.git

*** empty log message ***
---

diff --git a/hadaq/Makefile b/hadaq/Makefile
index 06a1ed2..dd4ce4b 100644
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -52,6 +52,7 @@ DAQ_CTRLCTU_OBJS = ctrlctu.o \
 	worker.o psxshm.o mman.o
 DAQ_SNIFF_OBJS = sniff.o online_clnt.o online_xdr.o
 DAQ_ANAL_OBJS = showevt.o hldread.o evt.o subevt.o hadtu.o
+LIBHADAQ_OBJS = worker.o psxshm.o mman.o
 
 mini: daq_readout daq_evtbuild
 seb: daq_readout daq_memnet daq_agent
@@ -95,6 +96,9 @@ daq_sniff: $(DAQ_SNIFF_OBJS)
 daq_anal: $(DAQ_ANAL_OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DAQ_ANAL_OBJS) $(LOADLIBES) -o daq_anal
 
+libhadaq.a: libhadaq.a($(LIBHADAQ_OBJS))
+	$(AR) $(ARFLAGS) $@ $?
+
 clean:
 	rm -f *.o *.out core tags \
 	agent.h agent_clnt.c agent_svc.c agent_xdr.c \
diff --git a/hadaq/makeenv b/hadaq/makeenv
index 974d413..c464a75 100644
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -3,60 +3,76 @@ HW_CONF=$2
 
 if test $HADAQ_CONF = "UNIX"
 then
+	export AR="ar"
 	export CC="c89"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -ltclParam -lhadesstd -llatm -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm"
-	export INCLUDES="-I/usr/local/include -I/usr/local/include/tcl -I$HOME/include"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -ltclParam -lhadesstd -llatm -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "HPUX"
 then
+	export AR="ar"
 	export CC="cc -Ae"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltk -lX11 -ltcl -lm"
-	export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltk -lX11 -ltcl -lm"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "UNIX_NOATM"
 then
+	export AR="ar"
 	export CC="c89"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt -ltk -lX11 -ltcl -lm"
-	export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt -ltk -lX11 -ltcl -lm"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "LINUX"
 then
+	export AR="ar"
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl -latm"
-	export INCLUDES="-I$HOME/include -I$HOME/include/tcl -I/usr/local/include/tcl"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl -latm"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "LINUX_NOATM"
 then
+	export AR="ar"
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
-	export INCLUDES="-I$HOME/include -I$HOME/include/tcl"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "LINUX_E128"
 then
+	export AR="ar"
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme"
-	export INCLUDES="-I$HOME/include -I$HOME/include/tcl"
+	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DLVME_SOFTSWAP -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "LYNXOS"
 then
+	export AR="ar"
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
-	export INCLUDES="-I/usr/local/include -I/usr/local/include/tcl -I$HOME/include -I$HOME/include/tcl"
+	export LOADLIBES="-L/usr/ATM/lib -L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT"
+	export ARFLAGS="rv"
 elif test $HADAQ_CONF = "LYNXOS_E7"
 then
+	export AR="ar"
 	export CC="gcc"
 	export RPCGEN="rpcgen"
 	export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -ltcl -lm -lrpc -lnetinet ../*.o"
-	export INCLUDES="-I/usr/local/include -I/usr/local/include/tcl -I$HOME/include -I$HOME/include/tcl"
+	export INCLUDES="-I/usr/local/include -I$HOME/include"
 	export DEFINES="-DHADESSTD_NEXITSTAT -DNOATM"
+	export ARFLAGS="rv"
 else
 	echo "Unknown HADAQ_CONF: $HADAQ_CONF, not set." >&2
 fi
diff --git a/hadaq/worker.c b/hadaq/worker.c
index 3c52e87..26831bf 100644
--- a/hadaq/worker.c
+++ b/hadaq/worker.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.6 2001-03-07 16:02:44 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.7 2001-07-02 11:58:44 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -331,3 +331,25 @@ void Worker_dump(Worker *my, time_t interval)
 		}
 	}
 }
+
+int Worker_getStatistic(const char *name, const char *stat, unsigned long int *value) {
+	int retVal = -1;
+	int i;
+	Worker myS, *my = &myS;
+	strcpy(my->name, name);
+
+	if (-1 == openStatShm(my)) {
+		*value = 0;
+	} else {
+		for (i = 0; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
+			if (strcmp(stat, my->statistics[i].name) == 0) {
+				*value = my->statistics[i].value;
+				retVal = 0;
+				i = WORKER_MAX_NUM_STATS;
+			}
+		}
+		closeStatShm(my);
+	}
+	return retVal;
+}
+
diff --git a/hadaq/worker.h b/hadaq/worker.h
index 8fa4921..6df8835 100644
--- a/hadaq/worker.h
+++ b/hadaq/worker.h
@@ -6,6 +6,8 @@
 
 #include "psxshm.h"
 
+#define WORKER_MAX_NUM_STATS 40
+
 typedef struct StatisticS {
 	char name[256];
 	unsigned long value;
@@ -33,5 +35,6 @@ void Worker_initEnd(Worker *my);
 void Worker_fini(Worker *my);
 unsigned long *Worker_addStatistic(Worker *my, const char *name);
 void Worker_dump(Worker *my, time_t interval);
+int Worker_getStatistic(const char *name, const char *stat, unsigned long int *value);
 
 #endif