diff --git a/examples/MQ/8-multipart/startMQEx8.sh.in b/examples/MQ/8-multipart/startMQEx8.sh.in index a66a91fe..002c44b2 100755 --- a/examples/MQ/8-multipart/startMQEx8.sh.in +++ b/examples/MQ/8-multipart/startMQEx8.sh.in @@ -3,12 +3,10 @@ ex8config="@CMAKE_BINARY_DIR@/bin/config/ex8-multipart.json" SAMPLER="ex8-sampler" SAMPLER+=" --id sampler1" -SAMPLER+=" --transport nanomsg" SAMPLER+=" --mq-config $ex8config" -xterm -geometry 80x23+0+0 -hold -e gdb --args @CMAKE_BINARY_DIR@/bin/examples/MQ/8-multipart/$SAMPLER & +xterm -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/MQ/8-multipart/$SAMPLER & SINK="ex8-sink" SINK+=" --id sink1" -SINK+=" --transport nanomsg" SINK+=" --mq-config $ex8config" xterm -geometry 80x23+500+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/MQ/8-multipart/$SINK & diff --git a/examples/MQ/multiple-transports/testMTEx.sh.in b/examples/MQ/multiple-transports/testMTEx.sh.in index ca84fc19..66a6595b 100755 --- a/examples/MQ/multiple-transports/testMTEx.sh.in +++ b/examples/MQ/multiple-transports/testMTEx.sh.in @@ -1,12 +1,12 @@ #!/bin/bash config="@CMAKE_BINARY_DIR@/bin/config/ex-multiple-transports.json" +SESSION="$(@CMAKE_BINARY_DIR@/bin/uuidGen -h)" -trap 'kill -TERM $SAMPLER1_PID; kill -TERM $SAMPLER2_PID; kill -TERM $SINK_PID; wait $SAMPLER1_PID; wait $SAMPLER2_PID; wait $SINK_PID; @CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup;' TERM - -@CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup +trap 'kill -TERM $SAMPLER1_PID; kill -TERM $SAMPLER2_PID; kill -TERM $SINK_PID; wait $SAMPLER1_PID; wait $SAMPLER2_PID; wait $SINK_PID; @CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup --session $SESSION;' TERM SINK="ex-mt-sink" SINK+=" --id sink1" +SINK+=" --session $SESSION" SINK+=" --max-iterations 1" SINK+=" --control static --log-color false" SINK+=" --transport shmem" @@ -16,6 +16,7 @@ SINK_PID=$! SAMPLER1="ex-mt-sampler1" SAMPLER1+=" --id sampler1" +SAMPLER1+=" --session $SESSION" SAMPLER1+=" --max-iterations 1" SAMPLER1+=" --control static --log-color false" SAMPLER1+=" --transport shmem" @@ -25,6 +26,7 @@ SAMPLER1_PID=$! SAMPLER2="ex-mt-sampler2" SAMPLER2+=" --id sampler2" +SAMPLER2+=" --session $SESSION" SAMPLER2+=" --max-iterations 1" SAMPLER2+=" --control static --log-color false" SAMPLER2+=" --transport nanomsg" diff --git a/examples/advanced/Region/FairMQExampleRegionSampler.cxx b/examples/advanced/Region/FairMQExampleRegionSampler.cxx index 4557512c..cd341315 100644 --- a/examples/advanced/Region/FairMQExampleRegionSampler.cxx +++ b/examples/advanced/Region/FairMQExampleRegionSampler.cxx @@ -77,6 +77,7 @@ void FairMQExampleRegionSampler::ResetTask() { LOG(DEBUG) << "waiting for all acknowledgements... (" << fNumUnackedMsgs << ")"; this_thread::sleep_for(chrono::milliseconds(500)); + LOG(DEBUG) << "done, still unacked: " << fNumUnackedMsgs; } fRegion.reset(); } diff --git a/examples/advanced/Region/testMQExRegion.sh.in b/examples/advanced/Region/testMQExRegion.sh.in index 8f7fbb08..8f030e24 100755 --- a/examples/advanced/Region/testMQExRegion.sh.in +++ b/examples/advanced/Region/testMQExRegion.sh.in @@ -1,17 +1,15 @@ #!/bin/bash exRegionConfig="@CMAKE_BINARY_DIR@/bin/config/ex-region.json" - msgSize="1000000" +SESSION="$(@CMAKE_BINARY_DIR@/bin/uuidGen -h)" # setup a trap to kill everything if the test fails/timeouts -trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SINK_PID; @CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup --session region_test' TERM - -@CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup --session region_test +trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SINK_PID; @CMAKE_BINARY_DIR@/bin/shmmonitor --cleanup --session $SESSION' TERM SAMPLER="ex-region-sampler" SAMPLER+=" --id sampler1" -SAMPLER+=" --session region_test" +SAMPLER+=" --session $SESSION" SAMPLER+=" --control static --log-color false" SAMPLER+=" --max-iterations 1" SAMPLER+=" --msg-size $msgSize" @@ -22,7 +20,7 @@ SAMPLER_PID=$! SINK="ex-region-sink" SINK+=" --id sink1" -SINK+=" --session region_test" +SINK+=" --session $SESSION" SINK+=" --verbosity INFO" SINK+=" --control static --log-color false" SINK+=" --max-iterations 1"