From d9d0f83ee09dd1e5d0f53d72ae982a5002384391 Mon Sep 17 00:00:00 2001
From: wierenga <sdos@astron.nl>
Date: Mon, 19 Sep 2005 13:51:22 +0000
Subject: [PATCH] bugid:120 Cleanup and rename of acceptor to acceptor_v2.
---
MAC/APL/PAC/CalServer/configure.in | 1 +
MAC/APL/PAC/CalServer/src/CalServer.cc | 2 +-
MAC/APL/PAC/CalServer/src/CalServer.conf.in | 4 +-
MAC/APL/PAC/CalServer/src/Makefile.am | 10 +-
MAC/APL/PAC/CalServer/src/calserver.in | 97 +++++++++++++++++++
MAC/APL/PAC/CalServer/test/Attic/Makefile.am | 3 +-
MAC/APL/PAC/CalServer/test/Makefile.am | 3 +-
MAC/APL/PAC/Calibration/configure.in | 1 +
MAC/APL/PAC/Calibration/src/CalServer.cc | 2 +-
MAC/APL/PAC/Calibration/src/CalServer.conf.in | 4 +-
MAC/APL/PAC/Calibration/src/Makefile.am | 10 +-
MAC/APL/PAC/Calibration/src/calserver.in | 97 +++++++++++++++++++
MAC/APL/PAC/Calibration/test/Makefile.am | 3 +-
13 files changed, 219 insertions(+), 18 deletions(-)
create mode 100644 MAC/APL/PAC/CalServer/src/calserver.in
create mode 100644 MAC/APL/PAC/Calibration/src/calserver.in
diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/CalServer/configure.in
index d29757867b1..7ca222c0f9a 100644
--- a/MAC/APL/PAC/CalServer/configure.in
+++ b/MAC/APL/PAC/CalServer/configure.in
@@ -77,4 +77,5 @@ AC_OUTPUT(
Makefile
src/Makefile
test/Makefile
+ src/calserver
)
diff --git a/MAC/APL/PAC/CalServer/src/CalServer.cc b/MAC/APL/PAC/CalServer/src/CalServer.cc
index 1a66cb75efb..9bbd5a51f8f 100644
--- a/MAC/APL/PAC/CalServer/src/CalServer.cc
+++ b/MAC/APL/PAC/CalServer/src/CalServer.cc
@@ -70,7 +70,7 @@ CalServer::CalServer(string name, ACCs& accs)
#endif
registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_signalnames);
- m_acceptor.init(*this, "acceptor", GCFPortInterface::MSPP, CAL_PROTOCOL);
+ m_acceptor.init(*this, "acceptor_v2", GCFPortInterface::MSPP, CAL_PROTOCOL);
}
CalServer::~CalServer()
diff --git a/MAC/APL/PAC/CalServer/src/CalServer.conf.in b/MAC/APL/PAC/CalServer/src/CalServer.conf.in
index 6e5314cc927..8e226760a8a 100644
--- a/MAC/APL/PAC/CalServer/src/CalServer.conf.in
+++ b/MAC/APL/PAC/CalServer/src/CalServer.conf.in
@@ -5,7 +5,7 @@
#
# CalServer task configuration
#
-mac.ns.CalServer.acceptor.type=TCP
+mac.ns.CalServer.acceptor_v2.type=TCP
#
# Define dimensions of the ACC array
@@ -45,4 +45,4 @@ CalServer.WriteACCToFile=1
# ACMProxy task configuration
#
mac.ns.ACMProxy.rspdriver.type=TCP
-mac.top.ACMProxy.rspdriver.remoteservice=RSPDriver:noacceptor
+mac.top.ACMProxy.rspdriver.remoteservice=RSPDriver:acceptor_v2
diff --git a/MAC/APL/PAC/CalServer/src/Makefile.am b/MAC/APL/PAC/CalServer/src/Makefile.am
index 5c6783d996b..144355941fd 100644
--- a/MAC/APL/PAC/CalServer/src/Makefile.am
+++ b/MAC/APL/PAC/CalServer/src/Makefile.am
@@ -1,5 +1,4 @@
-
AM_CPPFLAGS = -DUSE_CAL_THREAD
#-fmessage-length=0 // needed for Eclipse
@@ -106,19 +105,24 @@ CalServer_SOURCES = \
CalServer_LDADD = \
$(top_builddir)/src/libcal.la \
- $(top_builddir)/src/libcaldevel.la \
- -lrtccommon
+ $(top_builddir)/src/libcaldevel.la
+
+# -lrtccommon
juggle_acc_SOURCES = \
juggle_acc.cc
CalServer_DEPEND = $(LOFAR_DEPEND)
+
# libcal.la \
# libcaldevel.la \
# librtccommon.la
# -lrsp
+bin_SCRIPTS = \
+ calserver
+
clean-local:
rm -f *.ph
diff --git a/MAC/APL/PAC/CalServer/src/calserver.in b/MAC/APL/PAC/CalServer/src/calserver.in
new file mode 100644
index 00000000000..dcbefb1495c
--- /dev/null
+++ b/MAC/APL/PAC/CalServer/src/calserver.in
@@ -0,0 +1,97 @@
+#!/bin/bash
+#
+# calserver This shell script takes care of starting and stopping
+# the CalServer
+#
+# chkconfig: - 58 74
+# description: calserver is the script that starts or stops the CalServer. \
+# The CalServer controls the definition and calibration of Remote Station subarrays.
+
+# Source function library.
+. /etc/init.d/functions
+
+PREFIX=`dirname $0`/..
+
+if [ -f $PREFIX/etc/sysconfig/calserver ];then
+ . $PREFIX/etc/sysconfig/calserver
+fi
+
+# Check preconditions
+# These files must exist
+[ -x $PREFIX/bin/CalServer ] || exit 0
+[ -e $PREFIX/etc/CalServer.conf ] || exit 0
+
+RETVAL=0
+prog="CalServer"
+
+start() {
+ #
+ # Check if running as root
+ #
+ if [ "$USER" != "root" ]; then
+ echo Must run as root.
+ exit 0
+ fi
+
+ # set OPTIONS
+ OPTIONS=--root
+
+ # Start CalServer
+ echo -n $"Starting $prog: "
+ touch /var/run/$prog.pid
+ mkdir -p $PREFIX/var/log/
+ nohup $PREFIX/bin/$prog $OPTIONS > $PREFIX/var/log/CalServer.log &
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog && success $"$prog startup"
+ echo
+ return $RETVAL
+}
+
+stop() {
+ #
+ # Check if running as root
+ #
+ if [ "$USER" != "root" ]; then
+ echo Must run as root.
+ exit 0
+ fi
+
+ # Stop CalServer
+ echo -n $"Shutting down $prog: "
+ killproc $prog
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+ echo
+ return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ restart|reload)
+ stop
+ start
+ RETVAL=$?
+ ;;
+ condrestart)
+ if [ -f /var/lock/subsys/$prog ]; then
+ stop
+ start
+ RETVAL=$?
+ fi
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/MAC/APL/PAC/CalServer/test/Attic/Makefile.am b/MAC/APL/PAC/CalServer/test/Attic/Makefile.am
index 78597cf69c6..a4c546e1c37 100644
--- a/MAC/APL/PAC/CalServer/test/Attic/Makefile.am
+++ b/MAC/APL/PAC/CalServer/test/Attic/Makefile.am
@@ -17,8 +17,7 @@ CalTest_SOURCES = \
CalTest.cc
CalTest_LDADD = \
- $(top_builddir)/src/libcal.la \
- -lsuite
+ $(top_builddir)/src/libcal.la
BUILT_SOURCES = \
CalTest.conf
diff --git a/MAC/APL/PAC/CalServer/test/Makefile.am b/MAC/APL/PAC/CalServer/test/Makefile.am
index 78597cf69c6..a4c546e1c37 100644
--- a/MAC/APL/PAC/CalServer/test/Makefile.am
+++ b/MAC/APL/PAC/CalServer/test/Makefile.am
@@ -17,8 +17,7 @@ CalTest_SOURCES = \
CalTest.cc
CalTest_LDADD = \
- $(top_builddir)/src/libcal.la \
- -lsuite
+ $(top_builddir)/src/libcal.la
BUILT_SOURCES = \
CalTest.conf
diff --git a/MAC/APL/PAC/Calibration/configure.in b/MAC/APL/PAC/Calibration/configure.in
index d29757867b1..7ca222c0f9a 100644
--- a/MAC/APL/PAC/Calibration/configure.in
+++ b/MAC/APL/PAC/Calibration/configure.in
@@ -77,4 +77,5 @@ AC_OUTPUT(
Makefile
src/Makefile
test/Makefile
+ src/calserver
)
diff --git a/MAC/APL/PAC/Calibration/src/CalServer.cc b/MAC/APL/PAC/Calibration/src/CalServer.cc
index 1a66cb75efb..9bbd5a51f8f 100644
--- a/MAC/APL/PAC/Calibration/src/CalServer.cc
+++ b/MAC/APL/PAC/Calibration/src/CalServer.cc
@@ -70,7 +70,7 @@ CalServer::CalServer(string name, ACCs& accs)
#endif
registerProtocol(CAL_PROTOCOL, CAL_PROTOCOL_signalnames);
- m_acceptor.init(*this, "acceptor", GCFPortInterface::MSPP, CAL_PROTOCOL);
+ m_acceptor.init(*this, "acceptor_v2", GCFPortInterface::MSPP, CAL_PROTOCOL);
}
CalServer::~CalServer()
diff --git a/MAC/APL/PAC/Calibration/src/CalServer.conf.in b/MAC/APL/PAC/Calibration/src/CalServer.conf.in
index 6e5314cc927..8e226760a8a 100644
--- a/MAC/APL/PAC/Calibration/src/CalServer.conf.in
+++ b/MAC/APL/PAC/Calibration/src/CalServer.conf.in
@@ -5,7 +5,7 @@
#
# CalServer task configuration
#
-mac.ns.CalServer.acceptor.type=TCP
+mac.ns.CalServer.acceptor_v2.type=TCP
#
# Define dimensions of the ACC array
@@ -45,4 +45,4 @@ CalServer.WriteACCToFile=1
# ACMProxy task configuration
#
mac.ns.ACMProxy.rspdriver.type=TCP
-mac.top.ACMProxy.rspdriver.remoteservice=RSPDriver:noacceptor
+mac.top.ACMProxy.rspdriver.remoteservice=RSPDriver:acceptor_v2
diff --git a/MAC/APL/PAC/Calibration/src/Makefile.am b/MAC/APL/PAC/Calibration/src/Makefile.am
index 5c6783d996b..144355941fd 100644
--- a/MAC/APL/PAC/Calibration/src/Makefile.am
+++ b/MAC/APL/PAC/Calibration/src/Makefile.am
@@ -1,5 +1,4 @@
-
AM_CPPFLAGS = -DUSE_CAL_THREAD
#-fmessage-length=0 // needed for Eclipse
@@ -106,19 +105,24 @@ CalServer_SOURCES = \
CalServer_LDADD = \
$(top_builddir)/src/libcal.la \
- $(top_builddir)/src/libcaldevel.la \
- -lrtccommon
+ $(top_builddir)/src/libcaldevel.la
+
+# -lrtccommon
juggle_acc_SOURCES = \
juggle_acc.cc
CalServer_DEPEND = $(LOFAR_DEPEND)
+
# libcal.la \
# libcaldevel.la \
# librtccommon.la
# -lrsp
+bin_SCRIPTS = \
+ calserver
+
clean-local:
rm -f *.ph
diff --git a/MAC/APL/PAC/Calibration/src/calserver.in b/MAC/APL/PAC/Calibration/src/calserver.in
new file mode 100644
index 00000000000..dcbefb1495c
--- /dev/null
+++ b/MAC/APL/PAC/Calibration/src/calserver.in
@@ -0,0 +1,97 @@
+#!/bin/bash
+#
+# calserver This shell script takes care of starting and stopping
+# the CalServer
+#
+# chkconfig: - 58 74
+# description: calserver is the script that starts or stops the CalServer. \
+# The CalServer controls the definition and calibration of Remote Station subarrays.
+
+# Source function library.
+. /etc/init.d/functions
+
+PREFIX=`dirname $0`/..
+
+if [ -f $PREFIX/etc/sysconfig/calserver ];then
+ . $PREFIX/etc/sysconfig/calserver
+fi
+
+# Check preconditions
+# These files must exist
+[ -x $PREFIX/bin/CalServer ] || exit 0
+[ -e $PREFIX/etc/CalServer.conf ] || exit 0
+
+RETVAL=0
+prog="CalServer"
+
+start() {
+ #
+ # Check if running as root
+ #
+ if [ "$USER" != "root" ]; then
+ echo Must run as root.
+ exit 0
+ fi
+
+ # set OPTIONS
+ OPTIONS=--root
+
+ # Start CalServer
+ echo -n $"Starting $prog: "
+ touch /var/run/$prog.pid
+ mkdir -p $PREFIX/var/log/
+ nohup $PREFIX/bin/$prog $OPTIONS > $PREFIX/var/log/CalServer.log &
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog && success $"$prog startup"
+ echo
+ return $RETVAL
+}
+
+stop() {
+ #
+ # Check if running as root
+ #
+ if [ "$USER" != "root" ]; then
+ echo Must run as root.
+ exit 0
+ fi
+
+ # Stop CalServer
+ echo -n $"Shutting down $prog: "
+ killproc $prog
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+ echo
+ return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ restart|reload)
+ stop
+ start
+ RETVAL=$?
+ ;;
+ condrestart)
+ if [ -f /var/lock/subsys/$prog ]; then
+ stop
+ start
+ RETVAL=$?
+ fi
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/MAC/APL/PAC/Calibration/test/Makefile.am b/MAC/APL/PAC/Calibration/test/Makefile.am
index 78597cf69c6..a4c546e1c37 100644
--- a/MAC/APL/PAC/Calibration/test/Makefile.am
+++ b/MAC/APL/PAC/Calibration/test/Makefile.am
@@ -17,8 +17,7 @@ CalTest_SOURCES = \
CalTest.cc
CalTest_LDADD = \
- $(top_builddir)/src/libcal.la \
- -lsuite
+ $(top_builddir)/src/libcal.la
BUILT_SOURCES = \
CalTest.conf
--
GitLab