Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Framework/Core/src/DeviceSpecHelpers.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,7 @@ boost::program_options::options_description DeviceSpecHelpers::getForwardedDevic
("dpl-tracing-flags", bpo::value<std::string>(), "pipe separated list of events to trace") //
("signposts", bpo::value<std::string>()->default_value(defaultSignposts), //
"comma separated list of signposts to enable (any of `completion`, `data_processor_context`, `stream_context`, `device`, `monitoring_service`)") //
("log-timestamp-us", bpo::value<bool>()->zero_tokens()->default_value(false), "enable microsecond timestamps in log messages") //
("child-driver", bpo::value<std::string>(), "external driver to start childs with (e.g. valgrind)"); //

return forwardedDeviceOptions;
Expand Down
16 changes: 15 additions & 1 deletion Framework/Core/src/runDataProcessing.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,8 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
("data-processing-timeout", bpo::value<std::string>()->default_value(defaultDataProcessingTimeout), "how many second to wait before stopping data processing and allowing data calibration") //
("timeframes-rate-limit", bpo::value<std::string>()->default_value("0"), "how many timeframe can be in flight at the same moment (0 disables)") //
("configuration,cfg", bpo::value<std::string>()->default_value("command-line"), "configuration backend") //
("infologger-mode", bpo::value<std::string>()->default_value(defaultInfologgerMode), "O2_INFOLOGGER_MODE override");
("infologger-mode", bpo::value<std::string>()->default_value(defaultInfologgerMode), "O2_INFOLOGGER_MODE override") //
("log-timestamp-us", bpo::value<bool>()->zero_tokens()->default_value(false), "enable microsecond timestamps in log messages");
r.fConfig.AddToCmdLineOptions(optsDesc, true);
});

Expand Down Expand Up @@ -1114,6 +1115,12 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
serviceRef.get<RawDeviceService>().setDevice(device.get());
r.fDevice = std::move(device);
fair::Logger::SetConsoleColor(false);
if (r.fConfig.GetProperty<bool>("log-timestamp-us")) {
fair::Logger::DefineVerbosity(fair::Verbosity::user1,
fair::VerbositySpec::Make(fair::VerbositySpec::Info::timestamp_us,
fair::VerbositySpec::Info::severity));
fair::Logger::SetVerbosity(fair::Verbosity::user1);
}

/// Create all the requested services and initialise them
for (auto& service : spec.services) {
Expand Down Expand Up @@ -3156,6 +3163,13 @@ int doMain(int argc, char** argv, o2::framework::WorkflowSpec const& workflow,
}
}

if (varmap["log-timestamp-us"].as<bool>()) {
fair::Logger::DefineVerbosity(fair::Verbosity::user1,
fair::VerbositySpec::Make(fair::VerbositySpec::Info::timestamp_us,
fair::VerbositySpec::Info::severity));
fair::Logger::SetVerbosity(fair::Verbosity::user1);
}

enableSignposts(varmap["signposts"].as<std::string>());

auto evaluateBatchOption = [&varmap]() -> bool {
Expand Down
Loading