Skip to content

DFO Protocol Update #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eflumerf merged 18 commits into from
Oct 22, 2026
Merged

DFO Protocol Update #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
36550df
Update configuration objects for status-based DFO Protocol
eflumerf Jul 15, 2026
ae12e44
Update queue and connection rules]
eflumerf Jul 16, 2026
e1e2c98
Add static configurations for multi-dfo system
eflumerf Jul 16, 2026
9e38e1e
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Aug 3, 2026
4c3b24b
Increase busy threshold to 5
eflumerf Aug 5, 2026
a434ee7
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Aug 19, 2026
d845487
Extend request/reply wait timeout
eflumerf Aug 20, 2026
44aaef9
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Aug 20, 2026
5c7d4f3
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Aug 25, 2026
2c26631
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Sep 1, 2026
602dc48
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Sep 9, 2026
fcf44c7
Remove duplicate objects and run oks-format
eflumerf Sep 9, 2026
e294122
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Sep 10, 2026
90a9bb2
Update and format databases
eflumerf Sep 10, 2026
156c9e6
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Oct 1, 2026
24d30ff
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Oct 5, 2026
86064d4
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Oct 15, 2026
fa635fc
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtoc…
eflumerf Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 102 additions & 46 deletions config/daqsystemtest/connections.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="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"/>
Expand All @@ -78,13 +78,67 @@
</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-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"/>
</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"/>
<attr name="data_type" type="string" val="DataRequest"/>
<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"/>
Expand Down Expand Up @@ -184,6 +238,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"/>
Expand All @@ -209,16 +273,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"/>
Expand Down Expand Up @@ -304,6 +368,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"/>
Expand All @@ -314,6 +383,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"/>
Expand Down Expand Up @@ -347,7 +426,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>
Expand Down Expand Up @@ -394,6 +473,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"/>
Expand All @@ -407,57 +493,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="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 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>
Expand Down
74 changes: 53 additions & 21 deletions config/daqsystemtest/df-segment.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="us-ascii"?>
<?xml version="1.0" encoding="ASCII"?>

<!-- oks-data version 2.2 -->

Expand Down Expand Up @@ -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="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"/>
Expand All @@ -86,19 +86,19 @@
<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="td-trb-net-rule"/>
<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"/>
<!-- Used for TRMonRequestor
<ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
<ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-->
</rel>
<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"/>
Expand All @@ -115,20 +115,20 @@
<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="td-trb-net-rule"/>
<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"/>
<!-- Used for TRMonRequestor
<ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
<ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-->
</rel>
<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"/>
Expand All @@ -146,19 +146,19 @@
<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="td-trb-net-rule"/>
<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"/>
<!-- Used for TRMonRequestor
<ref class="NetworkConnectionRule" id="trmon-req-net-rule"/>
<ref class="NetworkConnectionRule" id="trigger-record-net-rule"/>
-->
</rel>
<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"/>
Expand All @@ -182,7 +182,37 @@
<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>

<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>
Expand All @@ -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"/>
Expand Down
Loading
Loading