Skip to content

Commit 7f354f4

Browse files
committed
More fixes for the plugins
1 parent e2ba424 commit 7f354f4

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Framework/Core/src/DeviceSpecHelpers.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,6 +1566,7 @@ void DeviceSpecHelpers::prepareArguments(bool defaultQuiet, bool defaultStopped,
15661566
realOdesc.add_options()("early-forward-policy", bpo::value<std::string>());
15671567
realOdesc.add_options()("session", bpo::value<std::string>());
15681568
realOdesc.add_options()("signposts", bpo::value<std::string>());
1569+
realOdesc.add_options()("workflow-plugin", bpo::value<std::string>());
15691570
filterArgsFct(expansions.we_wordc, expansions.we_wordv, realOdesc);
15701571
wordfree(&expansions);
15711572
return;
@@ -1757,6 +1758,7 @@ boost::program_options::options_description DeviceSpecHelpers::getForwardedDevic
17571758
("network-interface", bpo::value<std::string>(), "network interface to which to bind tpc fmq ports without specified address") //
17581759
("early-forward-policy", bpo::value<EarlyForwardPolicy>()->default_value(EarlyForwardPolicy::NEVER), "when to forward early the messages: never, noraw, always") //
17591760
("configuration,cfg", bpo::value<std::string>(), "configuration connection string") //
1761+
("workflow-plugin", bpo::value<std::string>(), "workflow configuration plugin") //
17601762
("driver-client-backend", bpo::value<std::string>(), "driver connection string") //
17611763
("monitoring-backend", bpo::value<std::string>(), "monitoring connection string") //
17621764
("dpl-stats-min-online-publishing-interval", bpo::value<std::string>(), "minimum flushing interval for online metrics (in s)") //

Framework/Core/src/runDataProcessing.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ std::string spawnDevice(uv_loop_t* loop,
716716
// the framework-id as one of the options.
717717
pid_t id = 0;
718718
id = fork();
719+
bool sameExecutable = strcmp(execution.args[0], driverInfo.argv[0]) == 0;
719720
// We are the child: prepare options and reexec.
720721
if (id == 0) {
721722
// If we are using plugins we can stop immediately when
@@ -1108,6 +1109,7 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
11081109
("data-processing-timeout", bpo::value<std::string>()->default_value(defaultDataProcessingTimeout), "how many second to wait before stopping data processing and allowing data calibration") //
11091110
("timeframes-rate-limit", bpo::value<std::string>()->default_value("0"), "how many timeframe can be in fly at the same moment (0 disables)") //
11101111
("configuration,cfg", bpo::value<std::string>()->default_value("command-line"), "configuration backend") //
1112+
("workflow-plugin", bpo::value<std::string>()->default_value(""), "workflow plugin to use") //
11111113
("infologger-mode", bpo::value<std::string>()->default_value(defaultInfologgerMode), "O2_INFOLOGGER_MODE override");
11121114
r.fConfig.AddToCmdLineOptions(optsDesc, true);
11131115
});

0 commit comments

Comments
 (0)