Rebased, cleaned up

This commit is contained in:
Alexey Rybalchenko
2019-07-10 17:00:36 +02:00
committed by Dennis Klein
parent ff581985f3
commit 07f7142ae2
6 changed files with 102 additions and 107 deletions

View File

@@ -42,8 +42,7 @@ bool Sampler::ConditionalRun()
// in case of error or transfer interruption, return false to go to IDLE state
// successfull transfer will return number of bytes transfered (can be 0 if sending an empty message).
if (Send(msg, "data1") < 0)
{
if (Send(msg, "data1") < 0) {
return false;
}

View File

@@ -2,6 +2,6 @@
# source setup.sh
@bash_end@
sampler, username@localhost, , /path/to/dds-work/, 1
processor, username@localhost, , /path/to/dds-work/, 10
sink, username@localhost, , /path/to/dds-work/, 1
sampler, username@localhost, , /home/username/dev/dds-work/, 1
processor, username@localhost, , /home/username/dev/dds-work/, 10
sink, username@localhost, , /home/username/dev/dds-work/, 1

View File

@@ -26,18 +26,18 @@ echo "SESSION ID: ${DDS_SESSION_ID}"
trap "cleanup ${DDS_SESSION_ID}" EXIT
requiredNofAgents=12
dds-submit -s ${DDS_SESSION_ID} -r localhost -n ${requiredNofAgents}
dds-info -s ${DDS_SESSION_ID} --wait-for-idle-agents ${requiredNofAgents}
dds-submit -r localhost -n ${requiredNofAgents}
dds-info --wait-for-idle-agents ${requiredNofAgents}
topologyFile=@DATA_DIR@/ex-dds-topology.xml
echo "TOPOLOGY FILE: ${topologyFile}"
dds-topology -s ${DDS_SESSION_ID} --disable-validation --activate ${topologyFile}
dds-topology --disable-validation --activate ${topologyFile}
echo "------------------------"
echo "Waiting for Topology to finish ..."
sampler_and_sink="main/(Sampler|Sink)"
fairmq-dds-command-ui -p $sampler_and_sink --wait-for-state RUNNING->READY
fairmq-dds-command-ui -p $sampler_and_sink --wait-for-state "RUNNING->READY"
echo "..."
fairmq-dds-command-ui -c s -w READY
fairmq-dds-command-ui -c t -w "DEVICE READY"
@@ -45,12 +45,12 @@ fairmq-dds-command-ui -c d -w IDLE
fairmq-dds-command-ui -c q -w EXITING
# fairmq-dds-command-ui -c q! -w EXITING
echo "..."
dds-info -s ${DDS_SESSION_ID} --wait-for-idle-agents ${requiredNofAgents}
dds-info --wait-for-idle-agents ${requiredNofAgents}
echo "------------------------"
dds-topology -s ${DDS_SESSION_ID} --stop
dds-topology --stop
dds-agent-cmd getlog -a -s ${DDS_SESSION_ID}
dds-agent-cmd getlog -a
logDir="${wrkDir}/logs"
for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
echo "AGENT LOG FILES IN: ${logDir}"