Skip to content

Commit 03557d6

Browse files
committed
DPL: finer grainded timestamps in logs
1 parent d661c23 commit 03557d6

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

Framework/Core/src/DeviceSpecHelpers.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,6 +1779,7 @@ boost::program_options::options_description DeviceSpecHelpers::getForwardedDevic
17791779
("dpl-tracing-flags", bpo::value<std::string>(), "pipe separated list of events to trace") //
17801780
("signposts", bpo::value<std::string>()->default_value(defaultSignposts), //
17811781
"comma separated list of signposts to enable (any of `completion`, `data_processor_context`, `stream_context`, `device`, `monitoring_service`)") //
1782+
("log-timestamp-us", bpo::value<bool>()->zero_tokens()->default_value(false), "enable microsecond timestamps in log messages") //
17821783
("child-driver", bpo::value<std::string>(), "external driver to start childs with (e.g. valgrind)"); //
17831784

17841785
return forwardedDeviceOptions;

Framework/Core/src/runDataProcessing.cxx

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,8 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
10651065
("data-processing-timeout", bpo::value<std::string>()->default_value(defaultDataProcessingTimeout), "how many second to wait before stopping data processing and allowing data calibration") //
10661066
("timeframes-rate-limit", bpo::value<std::string>()->default_value("0"), "how many timeframe can be in flight at the same moment (0 disables)") //
10671067
("configuration,cfg", bpo::value<std::string>()->default_value("command-line"), "configuration backend") //
1068-
("infologger-mode", bpo::value<std::string>()->default_value(defaultInfologgerMode), "O2_INFOLOGGER_MODE override");
1068+
("infologger-mode", bpo::value<std::string>()->default_value(defaultInfologgerMode), "O2_INFOLOGGER_MODE override") //
1069+
("log-timestamp-us", bpo::value<bool>()->zero_tokens()->default_value(false), "enable microsecond timestamps in log messages");
10691070
r.fConfig.AddToCmdLineOptions(optsDesc, true);
10701071
});
10711072

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

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

3166+
if (varmap["log-timestamp-us"].as<bool>()) {
3167+
fair::Logger::DefineVerbosity(fair::Verbosity::user1,
3168+
fair::VerbositySpec::Make(fair::VerbositySpec::Info::timestamp_us,
3169+
fair::VerbositySpec::Info::severity));
3170+
fair::Logger::SetVerbosity(fair::Verbosity::user1);
3171+
}
3172+
31593173
enableSignposts(varmap["signposts"].as<std::string>());
31603174

31613175
auto evaluateBatchOption = [&varmap]() -> bool {

0 commit comments

Comments
 (0)