Commit 7ab2ebc7 authored by Alexander Ivanov's avatar Alexander Ivanov
Browse files

Added frame writer build rule (make fw) to compile daqd without the GDS testpoints.

This version of daqd will not receive test point data traffic on UDP port 7098.
That port can be filterred out using the iptables.


git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/branches/branch-2.6@3386 6dcd42c9-f523-4c6d-aada-af552506706e
parent 341c32d5
......@@ -164,13 +164,20 @@ dc-omx:
/bin/mkdir -p build/dc-omx
(mysrc=$(srcdir); cd build/dc-omx; $$mysrc/src/daqd/configure '--enable-symmetricom' '--with-omx' '--without-myrinet' '--enable-debug' --with-epics=/opt/rtapps/epics/base '--with-framecpp=/opt/rtapps/framecpp' '--with-concentrator' && make)
# Build frame builder NDS or frame writer (broadcast receiver)
# Build frame builder NDS (broadcast receiver)
rcv:
(cd $(srcdir)/src/daqd; autoconf)
/bin/rm -rf build/rcv
/bin/mkdir -p build/rcv
(mysrc=$(srcdir); cd build/rcv; $$mysrc/src/daqd/configure '--disable-broadcast' '--enable-debug' '--with-broadcast' '--without-myrinet' '--with-framecpp=/opt/rtapps/framecpp' --with-epics=/opt/rtapps/epics/base && make)
# Build frame writer (broadcast receiver)
fw:
(cd $(srcdir)/src/daqd; autoconf)
/bin/rm -rf build/fw
/bin/mkdir -p build/fw
(mysrc=$(srcdir); cd build/fw; $$mysrc/src/daqd/configure '--disable-broadcast' '--enable-debug' '--with-broadcast' '--without-myrinet' '--with-framecpp=/opt/rtapps/framecpp' --with-epics=/opt/rtapps/epics/base && make)
# Build DMT 1-second frame broadcaster
bcst:
(cd $(srcdir)/src/daqd; autoconf)
......
......@@ -1360,11 +1360,15 @@ CommandLine: /* Nothing */
} else {
*yyout << setw (4) << setfill ('0') << hex << c[i].chNum;
}
#ifdef GDS_TESTPOINTS
if (IS_GDS_ALIAS(c[i])) {
*yyout << setw (4) << setfill ('0') << hex << c[i].tp_node;
} else {
#endif
*yyout << setw (4) << setfill ('0') << hex << c[i].group_num;
#ifdef GDS_TESTPOINTS
}
#endif
if ($3 < 2) {
*yyout << setw (4) << setfill ('0') << hex << (c[i].bps > 0xffff? 0: c[i].bps);
}
......
......@@ -154,6 +154,14 @@ AC_ARG_ENABLE(daemon,
AC_DEFINE(DAEMONIC)
fi],)
AC_ARG_ENABLE(testpoints,
[ --enable-testpoints Enable GDS testpoints (default)],
[if test x$enableval = xyes; then
AC_DEFINE(GDS_TESTPOINTS)
fi],[
AC_DEFINE(GDS_TESTPOINTS)
])
DEVFLAGS=\$\{PERFORMANCEFLAGS\}
AC_ARG_ENABLE(debug,
......@@ -169,7 +177,6 @@ AC_ARG_ENABLE(release,
fi],)
AC_SUBST(DEVFLAGS)
AC_DEFINE(GDS_TESTPOINTS)
GDSOBJECTS=\$\{CDS_GDSOBJECTS\}
GDSFLAGS=\$\{CDS_GDSFLAGS\}
GDSLIBFLAGS=\$\{CDS_GDSLIBFLAGS\}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment