Skip to content
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

Support Multiple DFOs through an update to the DFO Protocol #163

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Support Multiple DFOs through an update to the DFO Protocol #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91e71b1
Add DFOBrokerConf to DFApps
eflumerf Nov 13, 2024
306d286
Fix uid_base for heartbeat connections
eflumerf Nov 15, 2024
8a832dd
Update example_system for new dataflow connections
eflumerf Nov 15, 2024
590a370
Bring in moduleconfs from develop
eflumerf Nov 18, 2024
2bea274
Merge remote-tracking branch 'origin/develop' into eflumerf/DFOProtocol
eflumerf Nov 18, 2024
6c46768
Change trigger decisions to be PubSub so multiple DFOs can receive al…
eflumerf Nov 19, 2024
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
53 changes: 44 additions & 9 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="64" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241018T200355"/>
<info name="" type="" num-of-items="70" 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="20241119T190040"/>

<include>
<file path="schema/confmodel/dunedaq.schema.xml"/>
Expand All @@ -80,11 +80,18 @@
<rel name="associated_service" class="Service" id="dataRequests"/>
</obj>

<obj class="NetworkConnectionDescriptor" id="df-tokens">
<attr name="uid_base" type="string" val="dataflow_token"/>
<obj class="NetworkConnectionDescriptor" id="df-heartbeats">
<attr name="uid_base" type="string" val="dataflow_hb_"/>
<attr name="connection_type" type="enum" val="kPubSub"/>
<attr name="data_type" type="string" val="DataflowHeartbeat"/>
<rel name="associated_service" class="Service" id="heartbeat"/>
</obj>

<obj class="NetworkConnectionDescriptor" id="dfo-decisions">
<attr name="uid_base" type="string" val="dfo_decision_"/>
<attr name="connection_type" type="enum" val="kSendRecv"/>
<attr name="data_type" type="string" val="TriggerDecisionToken"/>
<rel name="associated_service" class="Service" id="dfTokens"/>
<attr name="data_type" type="string" val="DFODecision"/>
<rel name="associated_service" class="Service" id="dfoDecisions"/>
</obj>

<obj class="NetworkConnectionDescriptor" id="fragments">
Expand Down Expand Up @@ -138,7 +145,7 @@

<obj class="NetworkConnectionDescriptor" id="trigger-decisions-mlt-dfo">
<attr name="uid_base" type="string" val="td_mlt_dfo"/>
<attr name="connection_type" type="enum" val="kSendRecv"/>
<attr name="connection_type" type="enum" val="kPubSub"/>
<attr name="data_type" type="string" val="TriggerDecision"/>
<rel name="associated_service" class="Service" id="triggerDecisions"/>
</obj>
Expand All @@ -165,9 +172,14 @@
<rel name="descriptor" class="NetworkConnectionDescriptor" id="data-req-net-input"/>
</obj>

<obj class="NetworkConnectionRule" id="df-token-net-rule">
<obj class="NetworkConnectionRule" id="df-hb-net-rule">
<attr name="endpoint_class" type="class" val="DFOModule"/>
<rel name="descriptor" class="NetworkConnectionDescriptor" id="df-tokens"/>
<rel name="descriptor" class="NetworkConnectionDescriptor" id="df-heartbeats"/>
</obj>

<obj class="NetworkConnectionRule" id="dfo-decision-net-rule">
<attr name="endpoint_class" type="class" val="DFOBrokerModule"/>
<rel name="descriptor" class="NetworkConnectionDescriptor" id="dfo-decisions"/>
</obj>

<obj class="NetworkConnectionRule" id="frag-net-rule">
Expand Down Expand Up @@ -275,11 +287,21 @@
<rel name="descriptor" class="QueueDescriptor" id="tde-raw-input"/>
</obj>

<obj class="QueueConnectionRule" id="token-queue-rule">
<attr name="destination_class" type="class" val="DFOBrokerModule"/>
<rel name="descriptor" class="QueueDescriptor" id="token-input"/>
</obj>

<obj class="QueueConnectionRule" id="tp-queue-rule">
<attr name="destination_class" type="class" val="TriggerDataHandlerModule"/>
<rel name="descriptor" class="QueueDescriptor" id="tp-input"/>
</obj>

<obj class="QueueConnectionRule" id="trb-td-queue-rule">
<attr name="destination_class" type="class" val="TRBModule"/>
<rel name="descriptor" class="QueueDescriptor" id="td-input"/>
</obj>

<obj class="QueueConnectionRule" id="trigger-record-q-rule">
<attr name="destination_class" type="class" val="DataWriterModule"/>
<rel name="descriptor" class="QueueDescriptor" id="trigger-records"/>
Expand Down Expand Up @@ -358,6 +380,13 @@
<attr name="data_type" type="string" val="TDEEthFrame"/>
</obj>

<obj class="QueueDescriptor" id="token-input">
<attr name="uid_base" type="string" val="token_input_"/>
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
<attr name="capacity" type="u32" val="1000"/>
<attr name="data_type" type="string" val="TriggerDecisionToken"/>
</obj>

<obj class="QueueDescriptor" id="tp-input">
<attr name="uid_base" type="string" val="tp_input_"/>
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
Expand Down Expand Up @@ -410,7 +439,13 @@
<attr name="eth_device_name" type="string" val="eno1"/>
</obj>

<obj class="Service" id="dfTokens">
<obj class="Service" id="dfoDecisions">
<attr name="protocol" type="string" val="tcp"/>
<attr name="port" type="u16" val="0"/>
<attr name="eth_device_name" type="string" val="eno1"/>
</obj>

<obj class="Service" id="heartbeat">
<attr name="protocol" type="string" val="tcp"/>
<attr name="port" type="u16" val="0"/>
<attr name="eth_device_name" type="string" val="eno1"/>
Expand Down
32 changes: 24 additions & 8 deletions config/daqsystemtest/df-segment.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="20" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="eflumerf" last-modified-on="ironvirt9.IRONDOMAIN.local" last-modification-time="20241023T204409"/>
<info name="" type="" num-of-items="21" 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="20241115T170802"/>

<include>
<file path="schema/confmodel/dunedaq.schema.xml"/>
Expand All @@ -84,11 +84,13 @@
<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-queue-rule"/>
<ref class="QueueConnectionRule" id="trb-td-queue-rule"/>
</rel>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
<ref class="NetworkConnectionRule" id="dfo-decision-net-rule"/>
<ref class="NetworkConnectionRule" id="frag-net-rule"/>
<ref class="NetworkConnectionRule" id="df-token-net-rule"/>
<ref class="NetworkConnectionRule" id="df-hb-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"/>
Expand All @@ -97,6 +99,7 @@
<rel name="data_writers">
<ref class="DataWriterConf" id="dw-01"/>
</rel>
<rel name="broker" class="DFOBrokerConf" id="dfobroker-01"/>
<rel name="uses" class="DFHWConf" id="dfhw-01"/>
</obj>

Expand All @@ -110,11 +113,13 @@
<rel name="source_id" class="SourceIDConf" id="srcid-df-02"/>
<rel name="queue_rules">
<ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
<ref class="QueueConnectionRule" id="token-queue-rule"/>
<ref class="QueueConnectionRule" id="trb-td-queue-rule"/>
</rel>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
<ref class="NetworkConnectionRule" id="dfo-decision-net-rule"/>
<ref class="NetworkConnectionRule" id="frag-net-rule"/>
<ref class="NetworkConnectionRule" id="df-token-net-rule"/>
<ref class="NetworkConnectionRule" id="df-hb-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"/>
Expand All @@ -123,6 +128,7 @@
<rel name="data_writers">
<ref class="DataWriterConf" id="dw-01"/>
</rel>
<rel name="broker" class="DFOBrokerConf" id="dfobroker-01"/>
<rel name="uses" class="DFHWConf" id="dfhw-01"/>
</obj>

Expand All @@ -136,11 +142,13 @@
<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-queue-rule"/>
<ref class="QueueConnectionRule" id="trb-td-queue-rule"/>
</rel>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
<ref class="NetworkConnectionRule" id="dfo-decision-net-rule"/>
<ref class="NetworkConnectionRule" id="frag-net-rule"/>
<ref class="NetworkConnectionRule" id="df-token-net-rule"/>
<ref class="NetworkConnectionRule" id="df-hb-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"/>
Expand All @@ -149,6 +157,7 @@
<rel name="data_writers">
<ref class="DataWriterConf" id="dw-01"/>
</rel>
<rel name="broker" class="DFOBrokerConf" id="dfobroker-01"/>
<rel name="uses" class="DFHWConf" id="dfhw-01"/>
</obj>

Expand All @@ -168,11 +177,18 @@
<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"/>
</rel>
<rel name="dfo" class="DFOConf" id="dfoconf-01"/>
</obj>

<obj class="DFOBrokerConf" id="dfobroker-01">
<attr name="send_heartbeat_interval_ms" type="u32" val="1000"/>
<attr name="send_heartbeat_timeout_ms" type="u32" val="1000"/>
<attr name="td_timeout_ms" type="u32" val="1000"/>
<attr name="stop_timeout_ms" type="u32" val="5000"/>
<rel name="initial_active_dfo" class="DFOApplication" id="dfo-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"/>
Expand Down