Merge pull request #208 from DUNE-DAQ/feature/extra_stop_commands

Feature/extra stop commands

Author: plasorak

integtest/3ru_1df_multirun_test.py

@@ -71,10 +71,10 @@
 
 # The commands to run in nanorc, as a list
 if sufficient_resources_on_this_computer:
-    nanorc_command_list="integtest-partition boot init conf".split()
-    nanorc_command_list+="start --resume-wait 1 101 wait ".split() + [str(run_duration)] + "stop               wait 2".split()
-    nanorc_command_list+="start --resume-wait 2 102 wait ".split() + [str(run_duration)] + "stop --stop-wait 1 wait 2".split()
-    nanorc_command_list+="start                 103 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
+    nanorc_command_list="integtest-partition boot conf".split()
+    nanorc_command_list+="start_run --wait 1 101 wait ".split() + [str(run_duration)] + "stop_run          wait 2".split()
+    nanorc_command_list+="start_run --wait 2 102 wait ".split() + [str(run_duration)] + "stop_run --wait 1 wait 2".split()
+    nanorc_command_list+="start_run          103 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
     nanorc_command_list+="scrap terminate".split()
 else:
     nanorc_command_list=["boot", "terminate"]

integtest/3ru_3df_multirun_test.py

@@ -51,10 +51,10 @@
                    "DQM_System": confgen_arguments_base+["--enable-dqm"],
                   }
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf".split()
-nanorc_command_list+="start --resume-wait 1 101 wait ".split() + [str(run_duration)] + "stop               wait 2".split()
-nanorc_command_list+="start --resume-wait 2 102 wait ".split() + [str(run_duration)] + "stop --stop-wait 1 wait 2".split()
-nanorc_command_list+="start                 103 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
+nanorc_command_list="integtest-partition boot conf".split()
+nanorc_command_list+="start 101 enable_triggers wait ".split() + [str(run_duration)] + "stop_run wait 2".split()
+nanorc_command_list+="start 102 wait 1 enable_triggers wait ".split() + [str(run_duration)] + "disable_triggers wait 1 stop_run".split()
+nanorc_command_list+="start_run 103 wait ".split() + [str(run_duration)] + "disable_triggers wait 1 drain_dataflow wait 1 stop_trigger_sources wait 1 stop wait 2".split()
 nanorc_command_list+="scrap terminate".split()
 
 # The tests themselves

integtest/command_order_test.py

@@ -24,7 +24,7 @@
 ["integtest-partition", "conf"],
 ["integtest-partition", "start", "100"],
 ["integtest-partition", "resume"],
-["integtest-partition", "pause"],
+["integtest-partition", "disable_triggers"],
 ["integtest-partition", "stop"],
 ["integtest-partition", "scrap"],
 
@@ -33,7 +33,7 @@
 "integtest-partition boot conf".split(),
 "integtest-partition boot start 101".split(),
 "integtest-partition boot resume".split(),
-"integtest-partition boot pause".split(),
+"integtest-partition boot disable_triggers".split(),
 "integtest-partition boot stop".split(),
 "integtest-partition boot scrap".split(),
 
@@ -42,7 +42,7 @@
 "integtest-partition boot init init".split(),
 "integtest-partition boot init start 102".split(),
 "integtest-partition boot init resume".split(),
-"integtest-partition boot init pause".split(),
+"integtest-partition boot init disable_triggers".split(),
 "integtest-partition boot init stop".split(),
 "integtest-partition boot init scrap".split(),
 
@@ -51,10 +51,10 @@
 "integtest-partition boot init conf init".split(),
 "integtest-partition boot init conf conf".split(),
 "integtest-partition boot init conf resume".split(),
-"integtest-partition boot init conf pause".split(),
+"integtest-partition boot init conf disable_triggers".split(),
 "integtest-partition boot init conf stop".split(),
 
-# Only resume pause stop after start
+# Only resume disable_triggers stop after start
 "integtest-partition boot init conf start 103 boot".split(),
 "integtest-partition boot init conf start 104 init".split(),
 "integtest-partition boot init conf start 105 conf".split(),
@@ -66,15 +66,15 @@
 "integtest-partition boot init conf start 109 stop init".split(),
 "integtest-partition boot init conf start 110 stop conf".split(),
 "integtest-partition boot init conf start 111 stop resume".split(),
-"integtest-partition boot init conf start 112 stop pause".split(),
+"integtest-partition boot init conf start 112 stop disable_triggers".split(),
 "integtest-partition boot init conf start 113 stop stop".split(),
 
 # After scrap is same as init
 "integtest-partition boot init conf start 114 stop scrap boot".split(),
 "integtest-partition boot init conf start 115 stop scrap init".split(),
 "integtest-partition boot init conf start 116 stop scrap start 121".split(),
 "integtest-partition boot init conf start 117 stop scrap resume".split(),
-"integtest-partition boot init conf start 118 stop scrap pause".split(),
+"integtest-partition boot init conf start 118 stop scrap disable_triggers".split(),
 "integtest-partition boot init conf start 119 stop scrap stop".split(),
 "integtest-partition boot init conf start 120 stop scrap scrap".split(),
 

integtest/disabled_output_test.py

@@ -43,11 +43,11 @@
 confgen_arguments={"WIB1_System": confgen_arguments_base,
                    "Software_TPG_System": confgen_arguments_base+["--enable-software-tpg"]}
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf".split()
-nanorc_command_list+="start --disable-data-storage 101 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
-nanorc_command_list+="start                        102 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
-nanorc_command_list+="start --disable-data-storage 103 wait ".split() + [str(run_duration)] + "pause wait 2 stop  wait 2".split()
-nanorc_command_list+="start                        104 wait ".split() + [str(run_duration)] + "pause wait 2 stop  wait 2".split()
+nanorc_command_list="integtest-partition boot conf".split()
+nanorc_command_list+="start_run --disable-data-storage 101 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
+nanorc_command_list+="start_run                        102 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
+nanorc_command_list+="start_run --disable-data-storage 103 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
+nanorc_command_list+="start_run                        104 wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2".split()
 nanorc_command_list+="scrap terminate".split()
 
 # The tests themselves

integtest/fake_data_producer_test.py

@@ -37,10 +37,10 @@
 # The commands to run in nanorc, as a list
 # (the first run [#100] is included to warm up the DAQ processes and avoid warnings and errors caused by
 # startup sluggishness seen on slower test computers)
-nanorc_command_list="integtest-partition boot init conf".split()
-nanorc_command_list+="start                 101 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
-nanorc_command_list+="start --resume-wait 1 102 wait ".split() + [str(run_duration)] + "stop               wait 2".split()
-nanorc_command_list+="start --resume-wait 2 103 wait ".split() + [str(run_duration)] + "stop --stop-wait 1 wait 2".split()
+nanorc_command_list="integtest-partition boot conf".split()
+nanorc_command_list+="start_run          101 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
+nanorc_command_list+="start_run --wait 1 102 wait ".split() + [str(run_duration)] + "stop_run          wait 2".split()
+nanorc_command_list+="start_run --wait 2 103 wait ".split() + [str(run_duration)] + "stop_run --wait 1 wait 2".split()
 nanorc_command_list+="scrap terminate".split()
 
 # The tests themselves

integtest/long_window_readout_test.py

@@ -47,9 +47,9 @@
                    "With_TR_Splitting": confgen_arguments_base+["--max-trigger-record-window", str(trigger_record_max_window)],
                   }
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf".split()
-nanorc_command_list+="start --resume-wait 15 101 wait ".split() + [str(run_duration)] + "stop --stop-wait 2 wait 2".split()
-nanorc_command_list+="start --resume-wait 15 102 wait ".split() + [str(run_duration)] + "stop               wait 2".split()
+nanorc_command_list="integtest-partition boot conf".split()
+nanorc_command_list+="start_run --wait 15 101 wait ".split() + [str(run_duration)] + "stop_run --wait 2 wait 2".split()
+nanorc_command_list+="start 102 wait 15 enable_triggers wait ".split() + [str(run_duration)] + "stop_run wait 2".split()
 nanorc_command_list+="scrap terminate".split()
 
 # The tests themselves

integtest/minimal_system_quick_test.py

@@ -31,7 +31,7 @@
 # output directory (the test framework handles that)
 confgen_arguments=[ "-d", "./frames.bin", "-o", ".", "-s", "10", "-n", str(number_of_data_producers), "-b", "1000", "-a", "1000", "--host-ru", "localhost", "--op-env", "integtest"]
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf start 101 wait 1 resume wait ".split() + [str(run_duration)] + "pause wait 2 stop wait 2 scrap terminate".split()
+nanorc_command_list="integtest-partition boot conf start 101 wait 1 enable_triggers wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2 scrap terminate".split()
 
 # The tests themselves
 

integtest/multi_output_file_test.py

@@ -44,7 +44,7 @@
 confgen_arguments={"WIB1_System": confgen_arguments_base,
                    "Software_TPG_System": confgen_arguments_base+["--enable-software-tpg", "-c", str(3*number_of_data_producers*number_of_readout_apps)]}
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf start 101 resume wait 180 pause wait 2 stop wait 21 start 102 resume wait 120 pause wait 2 stop wait 21 scrap terminate".split()
+nanorc_command_list="integtest-partition boot conf start_run 101 wait 180 disable_triggers wait 2 stop_run wait 21 start_run 102 wait 120 disable_triggers wait 2 stop_run wait 21 scrap terminate".split()
 
 # The tests themselves
 

integtest/readout_type_scan.py

@@ -60,7 +60,7 @@
                    "PDS_(list)_System": confgen_arguments_base+["--frontend-type", "pds_list"], 
                    "PDS_(queue)_System": confgen_arguments_base+["--frontend-type", "pds_queue"]}
 # The commands to run in nanorc, as a list
-nanorc_command_list="integtest-partition boot init conf start 101 wait 1 resume wait ".split() + [str(run_duration)] + "pause wait 2 stop wait 2 scrap terminate".split()
+nanorc_command_list="integtest-partition boot conf start 101 wait 1 enable_triggers wait ".split() + [str(run_duration)] + "disable_triggers wait 2 stop_run wait 2 scrap terminate".split()
 
 # The tests themselves
 

plugins/DataFlowOrchestrator.cpp

@@ -52,7 +52,7 @@ DataFlowOrchestrator::DataFlowOrchestrator(const std::string& name)
 {
   register_command("conf", &DataFlowOrchestrator::do_conf);
   register_command("start", &DataFlowOrchestrator::do_start);
-  register_command("stop", &DataFlowOrchestrator::do_stop);
+  register_command("drain_dataflow", &DataFlowOrchestrator::do_stop);
   register_command("scrap", &DataFlowOrchestrator::do_scrap);
 }