Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 17:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

FairMQ: Add uuid generator to tools & let tests use it for session names.

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-11-28 17:25:39 +01:00
parent 5b091f7eec
commit 76017e2148
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/advanced/Region/FairMQExampleRegionSampler.cxx
View File

@@ -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();
}

10
examples/advanced/Region/testMQExRegion.sh.in
View File

@@ -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"