From fbefa1fd6d5aad4b6306d0747f6291d26444c2f4 Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 10 Nov 2000 18:00:34 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/evtbuild.c | 3 ++- hadaq/makeenv | 4 ++-- hadaq/nettrans.c | 6 +++--- hadaq/param.tcl | 4 ++-- hadaq/trig_shw.tcl | 34 +++++++++++++++++----------------- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 4a1ed1c..aede6c7 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.21 2000-11-08 12:07:42 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.22 2000-11-10 18:00:34 hades Exp $"; #define _POSIX_C_SOURCE 199309L @@ -18,6 +18,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had #include #include +#include "grmblfx.h" #include "worker.h" #include "evt.h" #include "subevt.h" diff --git a/hadaq/makeenv b/hadaq/makeenv index 7dd89a6..8000921 100644 --- a/hadaq/makeenv +++ b/hadaq/makeenv @@ -5,8 +5,8 @@ if test $HADAQ_CONF = "UNIX" then export CC="c89" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib/ -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm" - export INCLUDES="-I/usr/local/include -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/usr/local/include/tcl -I$HOME/include" export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT" elif test $HADAQ_CONF = "HPUX" then diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c index ec30ce1..347c143 100644 --- a/hadaq/nettrans.c +++ b/hadaq/nettrans.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.16 2000-09-20 13:52:32 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.17 2000-11-10 18:00:34 hades Exp $"; #define _GNU_SOURCE #include @@ -336,7 +336,7 @@ int NetTrans_send(NetTrans *my, void *hadTu) size_t pktSize; for (my->offset = 0; my->offset < HadTu_size(hadTu); my->offset += pktSize) { - my->pkt = hadTu + my->offset; + my->pkt = (char *)hadTu + my->offset; pktSize = min(my->mtuSize, HadTu_size(hadTu) - my->offset); /* we reserve pkts < 32 Byte for control messages */ @@ -382,7 +382,7 @@ static int assembleMsg(NetTrans *my, void *hadTu, size_t size) return 0; } - my->pkt = hadTu + my->offset; + my->pkt = (char *)hadTu + my->offset; if (0 > recvGeneric(my)) { abort(); } diff --git a/hadaq/param.tcl b/hadaq/param.tcl index 75ca00a..6c90db5 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -3,12 +3,12 @@ set evtbuild(stndln) 0 set evtbuild(nrofmsgs) 1 set netmem(file) ./daq_netmem set netmem(stndln) 0 -set netmem(inpath0) UDP:0.0.0.0:3000 +set netmem(inpath0) ATM:0:150 set netmem(nrofmsgs) 1 set netmem(verb) debug set memnet(file) ./daq_memnet set memnet(stndln) 0 -set memnet(outpath) UDP:140.181.110.27:3000 +set memnet(outpath) ATM:0:150 set memnet(bandwidth) 68000 set readout(file) ./daq_readout set readout(stndln) 0 diff --git a/hadaq/trig_shw.tcl b/hadaq/trig_shw.tcl index c5119b4..138b8a2 100644 --- a/hadaq/trig_shw.tcl +++ b/hadaq/trig_shw.tcl @@ -1,11 +1,11 @@ -agent create hades05 hades /home/hades/nov00/eb/hadaq +agent create hades24 hades /home/hades/nov00/eb/hadaq agent create r2-14 hades /hades/usr/hades/nov00/shw/hadaq agent create r2-13 hades /hades/usr/hades/nov00/trig/hadaq -worker create hades05:evtbuild -a -p -2 -s 2 -m 2 -worker create hades05:netmem -a -p -1 -m 2 -i ATM:0:50 -i ATM:0:51 -worker create r2-14:memnet -a -p -1 -w 68000 -o ATM:0:50 +worker create hades24:evtbuild -a -p -2 -s 2 -m 2 +worker create hades24:netmem -a -p -1 -m 2 -i ATM:0:100 -i ATM:0:101 +worker create r2-14:memnet -a -p -1 -w 68000 -o ATM:0:100 worker create r2-14:readout -a -p -2 -worker create r2-13:memnet -a -p -1 -w 68000 -o ATM:0:51 +worker create r2-13:memnet -a -p -1 -w 68000 -o ATM:0:101 worker create r2-13:readout -a -p -2 group create acquisition group create run @@ -13,30 +13,30 @@ group add acquisition r2-14:memnet group add acquisition r2-14:readout group add acquisition r2-13:memnet group add acquisition r2-13:readout -group add run hades05:evtbuild -group add run hades05:netmem +group add run hades24:evtbuild +group add run hades24:netmem set duringInit { - {rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw init'} >&hadaq.log} - {rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig reset'} >&hadaq.log} - {rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw start'} >&hadaq.log} - {rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig start'} >&hadaq.log} + {rsh r2-13 sh -c {'. .bash_profile; cd nov00/slow; ./trig reset'} >&hadaq.log} + {rsh r2-14 sh -c {'. .bash_profile; cd nov00/slow; ./shw reset'} >&hadaq.log} + {rsh r2-14 sh -c {'. .bash_profile; cd nov00/slow; ./shw start'} >&hadaq.log} + {rsh r2-13 sh -c {'. .bash_profile; cd nov00/slow; ./trig start'} >&hadaq.log} } set afterStartAcq { - {rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu start'} >&hadaq.log} + {rsh r2-13 sh -c {'. .bash_profile; ctustart'} >&hadaq.log} } set beforeStopAcq { - {rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu stop'} >&hadaq.log} + {rsh r2-13 sh -c {'. .bash_profile; ctustop'} >&hadaq.log} } set afterStopAcq { - {rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw stop'} >&hadaq.log} - {rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig stop'} >&hadaq.log} + {rsh r2-14 sh -c {'. .bash_profile; cd nov00/slow; ./shw stop'} >&hadaq.log} + {rsh r2-13 sh -c {'. .bash_profile; cd nov00/slow; ./trig stop'} >&hadaq.log} } -- 2.43.0