From 36550df6a933c4f1954dab2982f0b0ce976507a6 Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Wed, 15 Jul 2026 15:41:52 -0500
Subject: [PATCH 1/7] Update configuration objects for status-based DFO
 Protocol

---
 config/daqsystemtest/connections.data.xml | 128 ++++++++++++++++------
 config/daqsystemtest/df-segment.data.xml  |  25 ++---
 config/daqsystemtest/moduleconfs.data.xml |  21 +++-
 integtest/3ru_1df_multirun_test.py        |   2 +-
 4 files changed, 119 insertions(+), 57 deletions(-)

diff --git a/config/daqsystemtest/connections.data.xml b/config/daqsystemtest/connections.data.xml
index f56816ac..9ea155c4 100644
--- a/config/daqsystemtest/connections.data.xml
+++ b/config/daqsystemtest/connections.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="74" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260320T111440"/>
+<info name="" type="" num-of-items="84" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T203737"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -78,6 +78,36 @@
 </comments>
 
 
+<obj class="DataMoveCallbackDescriptor" id="crt-bern-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="CRTBernFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="crt-grenoble-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="CRTGrenobleFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="pds-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="PDSFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="pds-stream-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="PDSStreamFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="tde-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="TDEEthFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="wib-eth-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="WIBEthFrame"/>
+</obj>
+
 <obj class="NetworkConnectionDescriptor" id="data-req-net-input">
  <attr name="uid_base" type="string" val="data_requests_for_"/>
  <attr name="connection_type" type="enum" val="kSendRecv"/>
@@ -85,6 +115,20 @@
  <rel name="associated_service" class="Service" id="dataRequests"/>
 </obj>
 
+<obj class="NetworkConnectionDescriptor" id="dataflow-status-requests">
+ <attr name="uid_base" type="string" val="dataflow_status_request_"/>
+ <attr name="connection_type" type="enum" val="kSendRecv"/>
+ <attr name="data_type" type="string" val="DataflowStatusRequest"/>
+ <rel name="associated_service" class="Service" id="dataflowStatusRequests"/>
+</obj>
+
+<obj class="NetworkConnectionDescriptor" id="dataflow-statuses">
+ <attr name="uid_base" type="string" val="dataflow_status_"/>
+ <attr name="connection_type" type="enum" val="kSendRecv"/>
+ <attr name="data_type" type="string" val="DataflowStatus"/>
+ <rel name="associated_service" class="Service" id="dataflowStatuses"/>
+</obj>
+
 <obj class="NetworkConnectionDescriptor" id="df-tokens">
  <attr name="uid_base" type="string" val="dataflow_token"/>
  <attr name="connection_type" type="enum" val="kSendRecv"/>
@@ -184,6 +228,16 @@
  <rel name="descriptor" class="NetworkConnectionDescriptor" id="data-req-net-input"/>
 </obj>
 
+<obj class="NetworkConnectionRule" id="df-status-net-rule">
+ <attr name="endpoint_class" type="class" val="DFOModule"/>
+ <rel name="descriptor" class="NetworkConnectionDescriptor" id="dataflow-statuses"/>
+</obj>
+
+<obj class="NetworkConnectionRule" id="df-status-req-net-rule">
+ <attr name="endpoint_class" type="class" val="DataflowStatusModule"/>
+ <rel name="descriptor" class="NetworkConnectionDescriptor" id="dataflow-status-requests"/>
+</obj>
+
 <obj class="NetworkConnectionRule" id="df-token-net-rule">
  <attr name="endpoint_class" type="class" val="DFOModule"/>
  <rel name="descriptor" class="NetworkConnectionDescriptor" id="df-tokens"/>
@@ -209,16 +263,16 @@
  <rel name="descriptor" class="NetworkConnectionDescriptor" id="tc-publisher"/>
 </obj>
 
+<obj class="NetworkConnectionRule" id="td-df-net-rule">
+ <attr name="endpoint_class" type="class" val="DataflowStatusModule"/>
+ <rel name="descriptor" class="NetworkConnectionDescriptor" id="trigger-decisions"/>
+</obj>
+
 <obj class="NetworkConnectionRule" id="td-dfo-net-rule">
  <attr name="endpoint_class" type="class" val="DFOModule"/>
  <rel name="descriptor" class="NetworkConnectionDescriptor" id="trigger-decisions-mlt-dfo"/>
 </obj>
 
-<obj class="NetworkConnectionRule" id="td-trb-net-rule">
- <attr name="endpoint_class" type="class" val="TRBModule"/>
- <rel name="descriptor" class="NetworkConnectionDescriptor" id="trigger-decisions"/>
-</obj>
-
 <obj class="NetworkConnectionRule" id="ti-net-rule">
  <attr name="endpoint_class" type="class" val="TriggerDataHandlerModule"/>
  <rel name="descriptor" class="NetworkConnectionDescriptor" id="trigger-inhibits"/>
@@ -304,6 +358,11 @@
  <rel name="descriptor" class="QueueDescriptor" id="td-input"/>
 </obj>
 
+<obj class="QueueConnectionRule" id="token-q-rule">
+ <attr name="destination_class" type="class" val="DataflowStatusModule"/>
+ <rel name="descriptor" class="QueueDescriptor" id="df-tokens-q"/>
+</obj>
+
 <obj class="QueueConnectionRule" id="tp-queue-rule">
  <attr name="destination_class" type="class" val="TriggerDataHandlerModule"/>
  <rel name="descriptor" class="QueueDescriptor" id="tp-input"/>
@@ -314,6 +373,16 @@
  <rel name="descriptor" class="QueueDescriptor" id="tp-input"/>
 </obj>
 
+<obj class="QueueConnectionRule" id="trb-completion-queue-rule">
+ <attr name="destination_class" type="class" val="DataflowStatusModule"/>
+ <rel name="descriptor" class="QueueDescriptor" id="trb-completion-queue"/>
+</obj>
+
+<obj class="QueueConnectionRule" id="trb-td-q-rule">
+ <attr name="destination_class" type="class" val="TRBModule"/>
+ <rel name="descriptor" class="QueueDescriptor" id="td-input"/>
+</obj>
+
 <obj class="QueueConnectionRule" id="trigger-decision-token-q-rule">
  <attr name="destination_class" type="class" val="TRMonRequestorModule"/>
  <rel name="descriptor" class="QueueDescriptor" id="df-tokens-q"/>
@@ -347,7 +416,7 @@
 
 <obj class="QueueDescriptor" id="df-tokens-q">
  <attr name="uid_base" type="string" val="dataflow_token_"/>
- <attr name="queue_type" type="enum" val="kFollySPSCQueue"/>
+ <attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
  <attr name="capacity" type="u32" val="11"/>
  <attr name="data_type" type="string" val="TriggerDecisionToken"/>
 </obj>
@@ -394,6 +463,13 @@
  <attr name="data_type" type="string" val="TriggerPrimitiveVector"/>
 </obj>
 
+<obj class="QueueDescriptor" id="trb-completion-queue">
+ <attr name="uid_base" type="string" val="trb_completion_"/>
+ <attr name="queue_type" type="enum" val="kFollySPSCQueue"/>
+ <attr name="capacity" type="u32" val="1000"/>
+ <attr name="data_type" type="string" val="TRBCompletion"/>
+</obj>
+
 <obj class="QueueDescriptor" id="trigger-records">
  <attr name="uid_base" type="string" val="trigger_records_"/>
  <attr name="queue_type" type="enum" val="kFollySPSCQueue"/>
@@ -407,47 +483,27 @@
  <attr name="publish_timeout" type="u32" val="2"/>
 </obj>
 
-<obj class="DataMoveCallbackDescriptor" id="crt-bern-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="CRTBernFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="crt-grenoble-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="CRTGrenobleFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="PDSFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-stream-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="PDSStreamFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="tde-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="TDEEthFrame"/>
+<obj class="Service" id="HSIEvents">
+ <attr name="protocol" type="string" val="tcp"/>
+ <attr name="port" type="u16" val="0"/>
 </obj>
 
-<obj class="DataMoveCallbackDescriptor" id="wib-eth-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="WIBEthFrame"/>
+<obj class="Service" id="dataFragments">
+ <attr name="protocol" type="string" val="tcp"/>
+ <attr name="port" type="u16" val="0"/>
 </obj>
 
-<obj class="Service" id="HSIEvents">
+<obj class="Service" id="dataRequests">
  <attr name="protocol" type="string" val="tcp"/>
  <attr name="port" type="u16" val="0"/>
 </obj>
 
-<obj class="Service" id="dataFragments">
+<obj class="Service" id="dataflowStatusRequests">
  <attr name="protocol" type="string" val="tcp"/>
  <attr name="port" type="u16" val="0"/>
 </obj>
 
-<obj class="Service" id="dataRequests">
+<obj class="Service" id="dataflowStatuses">
  <attr name="protocol" type="string" val="tcp"/>
  <attr name="port" type="u16" val="0"/>
 </obj>
diff --git a/config/daqsystemtest/df-segment.data.xml b/config/daqsystemtest/df-segment.data.xml
index a4217578..c3948be8 100644
--- a/config/daqsystemtest/df-segment.data.xml
+++ b/config/daqsystemtest/df-segment.data.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="us-ascii"?>
+<?xml version="1.0" encoding="ASCII"?>
 
 <!-- oks-data version 2.2 -->
 
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="15" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20250825T202841"/>
+<info name="" type="" num-of-items="15" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T204121"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -88,18 +88,15 @@
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
  </rel>
  <rel name="network_rules">
-  <ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
+  <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
   <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
-     <!-- Used for TRMonRequestor
-  <ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
-  <ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-  -->
  </rel>
  <rel name="trb" class="TRBConf" id="trb-01"/>
+ <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
@@ -118,18 +115,15 @@
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
  </rel>
  <rel name="network_rules">
-  <ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
+  <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
   <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
-  <!-- Used for TRMonRequestor
-  <ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
-  <ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-  -->
  </rel>
  <rel name="trb" class="TRBConf" id="trb-01"/>
+ <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
@@ -148,18 +142,15 @@
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
  </rel>
  <rel name="network_rules">
-  <ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
+  <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
   <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
-     <!-- Used for TRMonRequestor
-  <ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
-  <ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-  -->
  </rel>
  <rel name="trb" class="TRBConf" id="trb-01"/>
+ <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml
index 54f37cc1..5be13ef5 100644
--- a/config/daqsystemtest/moduleconfs.data.xml
+++ b/config/daqsystemtest/moduleconfs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="96" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20251105T144619"/>
+<info name="" type="" num-of-items="99" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T203737"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -236,9 +236,12 @@
 <obj class="DFOConf" id="dfoconf-01">
  <attr name="general_queue_timeout_ms" type="u32" val="100"/>
  <attr name="stop_timeout_ms" type="u32" val="100"/>
+ <attr name="request_reply_wait_ms" type="u32" val="100"/>
  <attr name="td_send_retries" type="s32" val="5"/>
- <attr name="busy_threshold" type="s32" val="4"/>
- <attr name="free_threshold" type="s32" val="3"/>
+ <attr name="reallocate_building_triggers_on_timeout" type="bool" val="0"/>
+ <attr name="reallocate_writing_triggers_on_timeout" type="bool" val="0"/>
+ <attr name="status_watchdog_interval_ms" type="u32" val="1000"/>
+ <attr name="dataflow_status_timeout_ms" type="u32" val="5000"/>
 </obj>
 
 <obj class="DPDKReaderConf" id="def-emu-nic-receiver-conf">
@@ -527,6 +530,17 @@
  <rel name="data_store_params" class="DataStoreConf" id="default_tr_mon_conf"/>
 </obj>
 
+<obj class="DataflowStatusModuleConf" id="dfs-01">
+ <attr name="trigger_type_mask" type="u64" val="18446744073709551615"/>
+ <attr name="busy_threshold" type="s32" val="4"/>
+ <attr name="free_threshold" type="s32" val="3"/>
+ <attr name="heartbeat_interval_ms" type="u32" val="250"/>
+ <attr name="stop_timeout_ms" type="u32" val="1000"/>
+ <attr name="td_queue_timeout_ms" type="u32" val="1000"/>
+ <attr name="snapshot_history_size" type="u32" val="100"/>
+ <attr name="completed_trigger_history_size" type="u32" val="100"/>
+</obj>
+
 <obj class="FilenameParams" id="default">
  <attr name="file_type_prefix" type="enum" val="raw"/>
  <attr name="run_number_prefix" type="string" val="run"/>
@@ -891,6 +905,7 @@
  <attr name="tr_queue_timeout" type="u32" val="100"/>
  <attr name="request_queue_timeout" type="u32" val="100"/>
  <attr name="trigger_record_timeout_ms" type="u32" val="2858"/>
+ <attr name="trb_complete_timeout" type="u32" val="1000"/>
  <attr name="maximum_open_trigger_records" type="u32" val="100"/>
 </obj>
 
diff --git a/integtest/3ru_1df_multirun_test.py b/integtest/3ru_1df_multirun_test.py
index 140be4ea..8693b3c8 100644
--- a/integtest/3ru_1df_multirun_test.py
+++ b/integtest/3ru_1df_multirun_test.py
@@ -123,7 +123,7 @@
 )
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="DFOConf",
+        obj_class="DataflowStatusModuleConf",
         updates={"busy_threshold": 3, "free_threshold": 2}
     )
 )

From ae12e44a84283bb66304f610c53e6c799508982f Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Thu, 16 Jul 2026 09:04:59 -0500
Subject: [PATCH 2/7] Update queue and connection rules]

---
 config/daqsystemtest/df-segment.data.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/daqsystemtest/df-segment.data.xml b/config/daqsystemtest/df-segment.data.xml
index c3948be8..7c4276e7 100644
--- a/config/daqsystemtest/df-segment.data.xml
+++ b/config/daqsystemtest/df-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="15" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T204121"/>
+<info name="" type="" num-of-items="15" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260716T140001"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -86,11 +86,14 @@
  <rel name="source_id" class="SourceIDConf" id="srcid-df-01"/>
  <rel name="queue_rules">
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
+  <ref class="QueueConnectionRule" id="token-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-td-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-completion-queue-rule"/>
  </rel>
  <rel name="network_rules">
+  <ref class="NetworkConnectionRule" id="df-status-req-net-rule"/>
   <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
-  <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
@@ -112,12 +115,15 @@
  <rel name="opmon_conf" class="OpMonConf" id="slow-all-monitoring"/>
  <rel name="source_id" class="SourceIDConf" id="srcid-df-02"/>
  <rel name="queue_rules">
+  <ref class="QueueConnectionRule" id="token-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-td-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-completion-queue-rule"/>
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
  </rel>
  <rel name="network_rules">
+  <ref class="NetworkConnectionRule" id="df-status-req-net-rule"/>
   <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
-  <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
@@ -140,11 +146,14 @@
  <rel name="source_id" class="SourceIDConf" id="srcid-df-03"/>
  <rel name="queue_rules">
   <ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
+  <ref class="QueueConnectionRule" id="token-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-td-q-rule"/>
+  <ref class="QueueConnectionRule" id="trb-completion-queue-rule"/>
  </rel>
  <rel name="network_rules">
+  <ref class="NetworkConnectionRule" id="df-status-req-net-rule"/>
   <ref class="NetworkConnectionRule" id="td-df-net-rule"/>
   <ref class="NetworkConnectionRule" id="frag-net-rule"/>
-  <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
@@ -173,7 +182,7 @@
  <rel name="network_rules">
   <ref class="NetworkConnectionRule" id="td-dfo-net-rule"/>
   <ref class="NetworkConnectionRule" id="ti-net-rule"/>
-  <ref class="NetworkConnectionRule" id="df-token-net-rule"/>
+  <ref class="NetworkConnectionRule" id="df-status-net-rule"/>
  </rel>
  <rel name="dfo" class="DFOConf" id="dfoconf-01"/>
 </obj>

From e1e2c98d272444bdb4781e82751ed7da5834d378 Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Thu, 16 Jul 2026 09:42:18 -0500
Subject: [PATCH 3/7] Add static configurations for multi-dfo system

---
 config/daqsystemtest/df-segment.data.xml      | 34 +++++++++++++++++-
 config/daqsystemtest/example-configs.data.xml | 36 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/config/daqsystemtest/df-segment.data.xml b/config/daqsystemtest/df-segment.data.xml
index 7c4276e7..b6c414b9 100644
--- a/config/daqsystemtest/df-segment.data.xml
+++ b/config/daqsystemtest/df-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="15" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260716T140001"/>
+<info name="" type="" num-of-items="17" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260716T144155"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -187,6 +187,36 @@
  <rel name="dfo" class="DFOConf" id="dfoconf-01"/>
 </obj>
 
+<obj class="DFOApplication" id="dfo-02">
+ <attr name="application_name" type="string" val="daq_application"/>
+ <rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
+ <rel name="exposes_service">
+  <ref class="Service" id="daqapp_control"/>
+ </rel>
+ <rel name="opmon_conf" class="OpMonConf" id="slow-all-monitoring"/>
+ <rel name="network_rules">
+  <ref class="NetworkConnectionRule" id="td-dfo-net-rule"/>
+  <ref class="NetworkConnectionRule" id="ti-net-rule"/>
+  <ref class="NetworkConnectionRule" id="df-status-net-rule"/>
+ </rel>
+ <rel name="dfo" class="DFOConf" id="dfoconf-01"/>
+</obj>
+
+<obj class="DFOApplication" id="dfo-03">
+ <attr name="application_name" type="string" val="daq_application"/>
+ <rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
+ <rel name="exposes_service">
+  <ref class="Service" id="daqapp_control"/>
+ </rel>
+ <rel name="opmon_conf" class="OpMonConf" id="slow-all-monitoring"/>
+ <rel name="network_rules">
+  <ref class="NetworkConnectionRule" id="td-dfo-net-rule"/>
+  <ref class="NetworkConnectionRule" id="ti-net-rule"/>
+  <ref class="NetworkConnectionRule" id="df-status-net-rule"/>
+ </rel>
+ <rel name="dfo" class="DFOConf" id="dfoconf-01"/>
+</obj>
+
 <obj class="RCApplication" id="df-controller">
  <attr name="application_name" type="string" val="drunc-controller"/>
  <rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
@@ -201,6 +231,8 @@
  <rel name="applications">
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
   <ref class="DFOApplication" id="dfo-01"/>
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="DFApplication" id="df-01"/>
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
diff --git a/config/daqsystemtest/example-configs.data.xml b/config/daqsystemtest/example-configs.data.xml
index dbeeae03..42811e4d 100644
--- a/config/daqsystemtest/example-configs.data.xml
+++ b/config/daqsystemtest/example-configs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="10" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="mrigan" last-modified-on="np04-srv-016.cern.ch" last-modification-time="20251003T122227"/>
+<info name="" type="" num-of-items="11" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260716T144203"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -126,6 +126,8 @@
  <rel name="disabled">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="ReadoutApplication" id="ru-02"/>
  </rel>
  <rel name="connectivity_service" class="ConnectivityService" id="ehn1-connectivity-service-config"/>
@@ -142,6 +144,10 @@
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
  <attr name="log_path" type="string" val="/log"/>
+ <rel name="disabled">
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
+ </rel>
  <rel name="connectivity_service" class="ConnectivityService" id="ehn1-connectivity-service-config"/>
  <rel name="environment">
   <ref class="VariableSet" id="ehn1-variables"/>
@@ -156,6 +162,8 @@
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
  <rel name="disabled">
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
@@ -178,6 +186,8 @@
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
  <rel name="disabled">
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
   <ref class="ReadoutApplication" id="ru-02"/>
@@ -195,6 +205,26 @@
 </obj>
 
 <obj class="Session" id="local-2x3-config">
+ <attr name="data_request_timeout_ms" type="u32" val="1000"/>
+ <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
+ <attr name="controller_log_level" type="enum" val="INFO"/>
+ <rel name="disabled">
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
+ </rel>
+ <rel name="connectivity_service" class="ConnectivityService" id="local-connectivity-service-config"/>
+ <rel name="environment">
+  <ref class="VariableSet" id="local-variables"/>
+ </rel>
+ <rel name="segment" class="Segment" id="root-segment"/>
+ <rel name="infrastructure_applications">
+  <ref class="ConnectionService" id="local-connection-server"/>
+ </rel>
+ <rel name="detector_configuration" class="DetectorConfig" id="dummy-detector"/>
+ <rel name="opmon_uri" class="OpMonURI" id="local-opmon-uri"/>
+</obj>
+
+<obj class="Session" id="local-multidfo-config">
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
@@ -217,6 +247,8 @@
  <rel name="disabled">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
   <ref class="TriggerApplication" id="tc-maker-1"/>
  </rel>
@@ -239,6 +271,8 @@
  <rel name="disabled">
   <ref class="DFApplication" id="df-02"/>
   <ref class="DFApplication" id="df-03"/>
+  <ref class="DFOApplication" id="dfo-02"/>
+  <ref class="DFOApplication" id="dfo-03"/>
   <ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
  </rel>
  <rel name="connectivity_service" class="ConnectivityService" id="local-connectivity-service-config"/>

From 4c3b24ba74f100f97138d3590c451f4879b7ee35 Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Wed, 5 Aug 2026 07:52:07 -0500
Subject: [PATCH 4/7] Increase busy threshold to 5

---
 config/daqsystemtest/moduleconfs.data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml
index 5be13ef5..3acef3ff 100644
--- a/config/daqsystemtest/moduleconfs.data.xml
+++ b/config/daqsystemtest/moduleconfs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="99" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T203737"/>
+<info name="" type="" num-of-items="99" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260805T125106"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -532,7 +532,7 @@
 
 <obj class="DataflowStatusModuleConf" id="dfs-01">
  <attr name="trigger_type_mask" type="u64" val="18446744073709551615"/>
- <attr name="busy_threshold" type="s32" val="4"/>
+ <attr name="busy_threshold" type="s32" val="5"/>
  <attr name="free_threshold" type="s32" val="3"/>
  <attr name="heartbeat_interval_ms" type="u32" val="250"/>
  <attr name="stop_timeout_ms" type="u32" val="1000"/>

From d845487ce72686d45bab5966b5b4b0bbf201b6cc Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Thu, 20 Aug 2026 12:15:57 -0500
Subject: [PATCH 5/7] Extend request/reply wait timeout

---
 config/daqsystemtest/moduleconfs.data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml
index 3acef3ff..ce80c9ea 100644
--- a/config/daqsystemtest/moduleconfs.data.xml
+++ b/config/daqsystemtest/moduleconfs.data.xml
@@ -236,7 +236,7 @@
 <obj class="DFOConf" id="dfoconf-01">
  <attr name="general_queue_timeout_ms" type="u32" val="100"/>
  <attr name="stop_timeout_ms" type="u32" val="100"/>
- <attr name="request_reply_wait_ms" type="u32" val="100"/>
+ <attr name="request_reply_wait_ms" type="u32" val="500"/>
  <attr name="td_send_retries" type="s32" val="5"/>
  <attr name="reallocate_building_triggers_on_timeout" type="bool" val="0"/>
  <attr name="reallocate_writing_triggers_on_timeout" type="bool" val="0"/>

From fcf44c72f1c81738df91c67e8ec0fc6843ae954c Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Wed, 9 Sep 2026 11:34:00 -0500
Subject: [PATCH 6/7] Remove duplicate objects and run oks-format

---
 config/daqsystemtest/connections.data.xml     | 52 ++++---------------
 .../example-hsi-configs.data.xml              | 12 ++---
 config/daqsystemtest/hosts.data.xml           | 14 ++---
 config/daqsystemtest/hsi-dts-segment.data.xml |  4 +-
 .../daqsystemtest/hsi-fake-segment.data.xml   |  4 +-
 .../integrationtest-objects.data.xml          |  5 +-
 config/daqsystemtest/moduleconfs.data.xml     | 22 ++++----
 config/daqsystemtest/ru-segment.data.xml      |  4 +-
 config/daqsystemtest/trigger-segment.data.xml |  8 +--
 9 files changed, 51 insertions(+), 74 deletions(-)

diff --git a/config/daqsystemtest/connections.data.xml b/config/daqsystemtest/connections.data.xml
index 704e27df..a4ffa06c 100644
--- a/config/daqsystemtest/connections.data.xml
+++ b/config/daqsystemtest/connections.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="84" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260715T203737"/>
+<info name="" type="" num-of-items="86" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -88,6 +88,16 @@
  <attr name="data_type" type="string" val="CRTGrenobleFrame"/>
 </obj>
 
+<obj class="DataMoveCallbackDescriptor" id="pds-eth-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="DAPHNEEthFrame"/>
+</obj>
+
+<obj class="DataMoveCallbackDescriptor" id="pds-eth-stream-raw-input">
+ <attr name="uid_base" type="string" val="raw_input_"/>
+ <attr name="data_type" type="string" val="DAPHNEEthStreamFrame"/>
+</obj>
+
 <obj class="DataMoveCallbackDescriptor" id="pds-raw-input">
  <attr name="uid_base" type="string" val="raw_input_"/>
  <attr name="data_type" type="string" val="PDSFrame"/>
@@ -483,46 +493,6 @@
  <attr name="publish_timeout" type="u32" val="2"/>
 </obj>
 
-<obj class="DataMoveCallbackDescriptor" id="crt-bern-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="CRTBernFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="crt-grenoble-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="CRTGrenobleFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="PDSFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-stream-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="PDSStreamFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-eth-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="DAPHNEEthFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="pds-eth-stream-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="DAPHNEEthStreamFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="tde-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="TDEEthFrame"/>
-</obj>
-
-<obj class="DataMoveCallbackDescriptor" id="wib-eth-raw-input">
- <attr name="uid_base" type="string" val="raw_input_"/>
- <attr name="data_type" type="string" val="WIBEthFrame"/>
-</obj>
-
 <obj class="Service" id="HSIEvents">
  <attr name="protocol" type="string" val="tcp"/>
  <attr name="port" type="u16" val="0"/>
diff --git a/config/daqsystemtest/example-hsi-configs.data.xml b/config/daqsystemtest/example-hsi-configs.data.xml
index a3c4a957..84802341 100644
--- a/config/daqsystemtest/example-hsi-configs.data.xml
+++ b/config/daqsystemtest/example-hsi-configs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="4" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241023T204409"/>
+<info name="" type="" num-of-items="4" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -101,6 +101,11 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
+ <rel name="disabled">
+  <ref class="DFApplication" id="df-02"/>
+  <ref class="DFApplication" id="df-03"/>
+  <ref class="ReadoutApplication" id="ru-02"/>
+ </rel>
  <rel name="connectivity_service" class="ConnectivityService" id="local-connectivity-service-config"/>
  <rel name="environment">
   <ref class="Variable" id="local-env-ers-verb"/>
@@ -109,11 +114,6 @@
   <ref class="Variable" id="local-env-ers-error"/>
   <ref class="Variable" id="local-env-ers-fatal"/>
  </rel>
- <rel name="disabled">
-  <ref class="DFApplication" id="df-02"/>
-  <ref class="DFApplication" id="df-03"/>
-  <ref class="ReadoutApplication" id="ru-02"/>
- </rel>
  <rel name="segment" class="Segment" id="root-segment"/>
  <rel name="infrastructure_applications">
   <ref class="ConnectionService" id="local-connection-server"/>
diff --git a/config/daqsystemtest/hosts.data.xml b/config/daqsystemtest/hosts.data.xml
index 3beee188..6bed9dd5 100644
--- a/config/daqsystemtest/hosts.data.xml
+++ b/config/daqsystemtest/hosts.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="7" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230320T153246" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20240917T153633"/>
+<info name="" type="" num-of-items="19" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230320T153246" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -84,6 +84,12 @@
  </rel>
 </obj>
 
+<obj class="PhysicalHost" id="monkafka.cern.ch">
+ <rel name="contains">
+  <ref class="ProcessingResource" id="localhost_cpus"/>
+ </rel>
+</obj>
+
 <obj class="PhysicalHost" id="np04-srv-021">
  <rel name="contains">
   <ref class="ProcessingResource" id="np04-srv-021_cpus"/>
@@ -108,12 +114,6 @@
  </rel>
 </obj>
 
-<obj class="PhysicalHost" id="monkafka.cern.ch">
- <rel name="contains">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
- </rel>
-</obj>
-
 <obj class="PhysicalHost" id="pocket-host">
  <rel name="contains">
   <ref class="ProcessingResource" id="localhost_cpus"/>
diff --git a/config/daqsystemtest/hsi-dts-segment.data.xml b/config/daqsystemtest/hsi-dts-segment.data.xml
index f76ed0ed..97b73333 100644
--- a/config/daqsystemtest/hsi-dts-segment.data.xml
+++ b/config/daqsystemtest/hsi-dts-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="18" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241023T204410"/>
+<info name="" type="" num-of-items="14" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -127,6 +127,8 @@
  <attr name="template_for" type="class" val="HSIDataHandlerModule"/>
  <attr name="input_data_type" type="string" val="HSIFrame"/>
  <attr name="generate_timesync" type="bool" val="0"/>
+ <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
+ <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
  <rel name="request_handler" class="RequestHandler" id="hsi-dts-requesthandler"/>
  <rel name="latency_buffer" class="LatencyBuffer" id="hsi-dts-latencybuffer"/>
  <rel name="data_processor" class="HSIFrameProcessor" id="hsi-dts-processor"/>
diff --git a/config/daqsystemtest/hsi-fake-segment.data.xml b/config/daqsystemtest/hsi-fake-segment.data.xml
index 4ad81c44..e3734fea 100644
--- a/config/daqsystemtest/hsi-fake-segment.data.xml
+++ b/config/daqsystemtest/hsi-fake-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="14" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241023T204410"/>
+<info name="" type="" num-of-items="11" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -91,6 +91,8 @@
  <attr name="template_for" type="class" val="HSIDataHandlerModule"/>
  <attr name="input_data_type" type="string" val="HSIFrame"/>
  <attr name="generate_timesync" type="bool" val="0"/>
+ <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
+ <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
  <rel name="request_handler" class="RequestHandler" id="hsi-fake-requesthandler"/>
  <rel name="latency_buffer" class="LatencyBuffer" id="hsi-fake-latencybuffer"/>
  <rel name="data_processor" class="HSIFrameProcessor" id="hsi-fake-processor"/>
diff --git a/config/daqsystemtest/integrationtest-objects.data.xml b/config/daqsystemtest/integrationtest-objects.data.xml
index c4895644..e32335fe 100755
--- a/config/daqsystemtest/integrationtest-objects.data.xml
+++ b/config/daqsystemtest/integrationtest-objects.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="22" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T110859" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241023T204410"/>
+<info name="" type="" num-of-items="21" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T110859" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -81,6 +81,7 @@
  <comment creation-time="20240909T081245" created-by="glehmann" created-on="np04-srv-024.cern.ch" author="glehmann" text=" "/>
 </comments>
 
+
 <obj class="DFHWConf" id="dfhw-01">
  <rel name="uses">
   <ref class="StorageDevice" id="storage-01"/>
@@ -91,6 +92,8 @@
  <attr name="template_for" type="class" val="HSIDataHandlerModule"/>
  <attr name="input_data_type" type="string" val="HSIFrame"/>
  <attr name="generate_timesync" type="bool" val="0"/>
+ <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
+ <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
  <rel name="request_handler" class="RequestHandler" id="hsi-requesthandler-generic"/>
  <rel name="latency_buffer" class="LatencyBuffer" id="hsilatencybuffer-generic"/>
  <rel name="data_processor" class="HSIFrameProcessor" id="def-hsi-processor"/>
diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml
index d6ec0611..df4e285d 100644
--- a/config/daqsystemtest/moduleconfs.data.xml
+++ b/config/daqsystemtest/moduleconfs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="97" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20251105T144619"/>
+<info name="" type="" num-of-items="102" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163348"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -372,9 +372,9 @@
  <rel name="data_processor" class="TPCRawDataProcessor" id="def-wib-processor"/>
 </obj>
 
-<obj class="DataHandlerConf" id="def-pds-link-handler">
+<obj class="DataHandlerConf" id="def-pds-eth-link-handler">
  <attr name="template_for" type="class" val="FDDataHandlerModule"/>
- <attr name="input_data_type" type="string" val="PDSFrame"/>
+ <attr name="input_data_type" type="string" val="DAPHNEEthFrame"/>
  <attr name="generate_timesync" type="bool" val="1"/>
  <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
  <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
@@ -383,31 +383,31 @@
  <rel name="data_processor" class="PDSRawDataProcessor" id="def-pds-processor"/>
 </obj>
 
-<obj class="DataHandlerConf" id="def-pds-eth-link-handler">
+<obj class="DataHandlerConf" id="def-pds-eth-stream-link-handler">
  <attr name="template_for" type="class" val="FDDataHandlerModule"/>
- <attr name="input_data_type" type="string" val="DAPHNEEthFrame"/>
+ <attr name="input_data_type" type="string" val="DAPHNEEthStreamFrame"/>
  <attr name="generate_timesync" type="bool" val="1"/>
  <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
  <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
  <rel name="request_handler" class="RequestHandler" id="def-data-request-handler"/>
  <rel name="latency_buffer" class="LatencyBuffer" id="def-latency-buf"/>
- <rel name="data_processor" class="PDSRawDataProcessor" id="def-pds-processor"/>
+ <rel name="data_processor" class="DataProcessor" id="def-base-processor"/>
 </obj>
 
-<obj class="DataHandlerConf" id="def-pds-stream-link-handler">
+<obj class="DataHandlerConf" id="def-pds-link-handler">
  <attr name="template_for" type="class" val="FDDataHandlerModule"/>
- <attr name="input_data_type" type="string" val="PDSStreamFrame"/>
+ <attr name="input_data_type" type="string" val="PDSFrame"/>
  <attr name="generate_timesync" type="bool" val="1"/>
  <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
  <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
  <rel name="request_handler" class="RequestHandler" id="def-data-request-handler"/>
  <rel name="latency_buffer" class="LatencyBuffer" id="def-latency-buf"/>
- <rel name="data_processor" class="DataProcessor" id="def-base-processor"/>
+ <rel name="data_processor" class="PDSRawDataProcessor" id="def-pds-processor"/>
 </obj>
 
-<obj class="DataHandlerConf" id="def-pds-eth-stream-link-handler">
+<obj class="DataHandlerConf" id="def-pds-stream-link-handler">
  <attr name="template_for" type="class" val="FDDataHandlerModule"/>
- <attr name="input_data_type" type="string" val="DAPHNEEthStreamFrame"/>
+ <attr name="input_data_type" type="string" val="PDSStreamFrame"/>
  <attr name="generate_timesync" type="bool" val="1"/>
  <attr name="post_processing_delay_min_wait" type="u64" val="1"/>
  <attr name="post_processing_delay_max_wait" type="u64" val="5"/>
diff --git a/config/daqsystemtest/ru-segment.data.xml b/config/daqsystemtest/ru-segment.data.xml
index 2564abfc..7d679b16 100644
--- a/config/daqsystemtest/ru-segment.data.xml
+++ b/config/daqsystemtest/ru-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="62" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105615" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260305T122304"/>
+<info name="" type="" num-of-items="61" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105615" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163348"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -123,7 +123,7 @@
  </rel>
  <rel name="queue_rules">
   <ref class="QueueConnectionRule" id="crt-bern-sender-input-queue-rule"/>
- </rel> 
+ </rel>
  <rel name="detector_frame_builder" class="CRTBernFrameBuilderConf" id="def-crt-bern-frame-builder-conf"/>
  <rel name="data_writer" class="SocketWriterConf" id="def-socket-writer-conf"/>
  <rel name="detector_connections">
diff --git a/config/daqsystemtest/trigger-segment.data.xml b/config/daqsystemtest/trigger-segment.data.xml
index b6c74bc1..7c58173e 100644
--- a/config/daqsystemtest/trigger-segment.data.xml
+++ b/config/daqsystemtest/trigger-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="12" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="mrigan" last-modified-on="np04-srv-016.cern.ch" last-modification-time="20250522T092014"/>
+<info name="" type="" num-of-items="12" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163348"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -226,6 +226,9 @@
   <ref class="Service" id="dataRequests"/>
  </rel>
  <rel name="opmon_conf" class="OpMonConf" id="slow-all-monitoring"/>
+ <rel name="action_plans">
+  <ref class="ActionPlan" id="tc-maker-start"/>
+ </rel>
  <rel name="source_id" class="SourceIDConf" id="ta-srcid-1"/>
  <rel name="queue_rules">
   <ref class="QueueConnectionRule" id="ta-queue-rule"/>
@@ -235,9 +238,6 @@
   <ref class="NetworkConnectionRule" id="tc-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
  </rel>
- <rel name="action_plans">
-  <ref class="ActionPlan" id="tc-maker-start"/>
- </rel>
  <rel name="data_subscriber" class="DataReaderConf" id="ta-subscriber-1"/>
  <rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-ta-handler"/>
 </obj>

From 90a9bb2f580bf0af83eb02efcef522465b076d9b Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Thu, 10 Sep 2026 09:34:23 -0500
Subject: [PATCH 7/7] Update and format databases

---
 config/daqsystemtest/df-segment.data.xml      |  8 +-
 config/daqsystemtest/example-configs.data.xml |  2 +-
 .../example-hsi-configs.data.xml              | 12 +--
 config/daqsystemtest/hosts.data.xml           | 92 +++++++++----------
 4 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/config/daqsystemtest/df-segment.data.xml b/config/daqsystemtest/df-segment.data.xml
index b6c414b9..1bf24c20 100644
--- a/config/daqsystemtest/df-segment.data.xml
+++ b/config/daqsystemtest/df-segment.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="17" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260716T144155"/>
+<info name="" type="" num-of-items="17" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260910T143415"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -98,8 +98,8 @@
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
  </rel>
- <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
+ <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
@@ -128,8 +128,8 @@
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
  </rel>
- <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
+ <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
@@ -158,8 +158,8 @@
   <ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
   <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
  </rel>
- <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="dfs" class="DataflowStatusModuleConf" id="dfs-01"/>
+ <rel name="trb" class="TRBConf" id="trb-01"/>
  <rel name="data_writers">
   <ref class="DataWriterConf" id="dw-01"/>
  </rel>
diff --git a/config/daqsystemtest/example-configs.data.xml b/config/daqsystemtest/example-configs.data.xml
index 2ce510af..2a0b2548 100644
--- a/config/daqsystemtest/example-configs.data.xml
+++ b/config/daqsystemtest/example-configs.data.xml
@@ -144,7 +144,7 @@
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
  <attr name="log_path" type="string" val="/log"/>
- <rel name="disabled">
+ <rel name="excluded">
   <ref class="DFOApplication" id="dfo-02"/>
   <ref class="DFOApplication" id="dfo-03"/>
  </rel>
diff --git a/config/daqsystemtest/example-hsi-configs.data.xml b/config/daqsystemtest/example-hsi-configs.data.xml
index a1337d9f..6a6eb934 100644
--- a/config/daqsystemtest/example-hsi-configs.data.xml
+++ b/config/daqsystemtest/example-hsi-configs.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="4" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
+<info name="" type="" num-of-items="4" oks-format="data" oks-version="862f2957270" created-by="asztuc" created-on="np04-srv-019.cern.ch" creation-time="20231212T171111" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260910T143415"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -101,6 +101,11 @@
  <attr name="data_request_timeout_ms" type="u32" val="1000"/>
  <attr name="data_rate_slowdown_factor" type="u32" val="1"/>
  <attr name="controller_log_level" type="enum" val="INFO"/>
+ <rel name="excluded">
+  <ref class="DFApplication" id="df-02"/>
+  <ref class="DFApplication" id="df-03"/>
+  <ref class="ReadoutApplication" id="ru-02"/>
+ </rel>
  <rel name="connectivity_service" class="ConnectivityService" id="local-connectivity-service-config"/>
  <rel name="environment">
   <ref class="Variable" id="local-env-ers-verb"/>
@@ -109,11 +114,6 @@
   <ref class="Variable" id="local-env-ers-error"/>
   <ref class="Variable" id="local-env-ers-fatal"/>
  </rel>
- <rel name="excluded">
-  <ref class="DFApplication" id="df-02"/>
-  <ref class="DFApplication" id="df-03"/>
-  <ref class="ReadoutApplication" id="ru-02"/>
- </rel>
  <rel name="segment" class="Segment" id="root-segment"/>
  <rel name="infrastructure_applications">
   <ref class="ConnectionService" id="local-connection-server"/>
diff --git a/config/daqsystemtest/hosts.data.xml b/config/daqsystemtest/hosts.data.xml
index 2860a703..3a181a20 100644
--- a/config/daqsystemtest/hosts.data.xml
+++ b/config/daqsystemtest/hosts.data.xml
@@ -63,7 +63,7 @@
 
 <oks-data>
 
-<info name="" type="" num-of-items="19" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230320T153246" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260909T163347"/>
+<info name="" type="" num-of-items="19" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230320T153246" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260910T143415"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -78,54 +78,6 @@
 </comments>
 
 
-<obj class="PhysicalHost" id="localhost">
- <rel name="contains">
-  <ref class="HostCores" id="localhost_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="monkafka.cern.ch">
- <rel name="contains">
-  <ref class="ProcessingResource" id="localhost_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="np04-srv-021">
- <rel name="contains">
-  <ref class="HostCores" id="np04-srv-021_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="np04-srv-022">
- <rel name="contains">
-  <ref class="HostCores" id="np04-srv-022_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="np04-srv-028">
- <rel name="contains">
-  <ref class="HostCores" id="np04-srv-028_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="np04-srv-029">
- <rel name="contains">
-  <ref class="HostCores" id="np04-srv-029_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="monkafka.cern.ch">
- <rel name="contains">
-  <ref class="HostCores" id="localhost_cpus"/>
- </rel>
-</obj>
-
-<obj class="PhysicalHost" id="pocket-host">
- <rel name="contains">
-  <ref class="HostCores" id="localhost_cpus"/>
- </rel>
-</obj>
-
 <obj class="HostCores" id="localhost_cpus">
  <attr name="cpu_cores" type="u16">
   <data val="0"/>
@@ -171,6 +123,48 @@
  </attr>
 </obj>
 
+<obj class="PhysicalHost" id="localhost">
+ <rel name="contains">
+  <ref class="HostCores" id="localhost_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="monkafka.cern.ch">
+ <rel name="contains">
+  <ref class="HostCores" id="localhost_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="np04-srv-021">
+ <rel name="contains">
+  <ref class="HostCores" id="np04-srv-021_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="np04-srv-022">
+ <rel name="contains">
+  <ref class="HostCores" id="np04-srv-022_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="np04-srv-028">
+ <rel name="contains">
+  <ref class="HostCores" id="np04-srv-028_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="np04-srv-029">
+ <rel name="contains">
+  <ref class="HostCores" id="np04-srv-029_cpus"/>
+ </rel>
+</obj>
+
+<obj class="PhysicalHost" id="pocket-host">
+ <rel name="contains">
+  <ref class="HostCores" id="localhost_cpus"/>
+ </rel>
+</obj>
+
 <obj class="VirtualHost" id="kafka-cern-vhost">
  <rel name="uses">
   <ref class="HostCores" id="localhost_cpus"/>