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

Fix odc_expendable_task requirement in DDS XML #12765

Closed
wants to merge 2 commits into from
Closed

Fix odc_expendable_task requirement in DDS XML #12765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c054f1b
Fix odc_expendable_task requirement in DDS XML
martenole Feb 26, 2024
c6de600
Update test as well
martenole Feb 26, 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
2 changes: 1 addition & 1 deletion Framework/Core/src/DDSConfigHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void DDSConfigHelpers::dumpDeviceSpec2DDS(std::ostream& out,
out << fmt::format("cat ${{DDS_LOCATION}}/dpl_json{}.asset | o2-dpl-run --driver-mode embedded", workflowSuffix);
out << R"(</exe>)"
<< "<requirements>\n"
<< " <requirement name=\"odc_expendable_task\" />\n"
<< " <name>odc_expendable_task</name>\n"
<< "</requirements>\n"
<< "\n";
out << "</decltask>";
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_FrameworkDataFlowToDDS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ TEST_CASE("TestDDSExpendable")
<assets><name>dpl_json</name></assets>
<exe reachable="true">cat ${DDS_LOCATION}/dpl_json.asset | foo --id D_dds%TaskIndex%_%CollectionIndex% --shm-monitor false --log-color false --batch --color false --channel-config "name=from_B_to_D,type=pull,method=connect,address=ipc://@localhostworkflow-id_22002,transport=shmem,rateLogging=0,rcvBufSize=1,sndBufSize=1" --channel-config "name=from_C_to_D,type=pull,method=connect,address=ipc://@localhostworkflow-id_22003,transport=shmem,rateLogging=0,rcvBufSize=1,sndBufSize=1" --bad-alloc-attempt-interval 50 --bad-alloc-max-attempts 1 --early-forward-policy never --io-threads 1 --jobs 4 --severity info --shm-allocation rbtree_best_fit --shm-mlock-segment false --shm-mlock-segment-on-creation false --shm-no-cleanup false --shm-segment-id 0 --shm-throw-bad-alloc true --shm-zero-segment false --stacktrace-on-signal simple --timeframes-rate-limit 0 --a-param 1 --b-param "" --c-param "foo;bar" --session dpl_workflow-id --plugin odc</exe>
<requirements>
<requirement name="odc_expendable_task" />
<name>odc_expendable_task</name>
</requirements>
</decltask>
<declcollection name="DPL">
Expand Down
Loading