DPL: allow generic control of signposts from the driver

Author: ktf

Framework/Core/src/WSDriverClient.cxx

@@ -188,48 +188,40 @@ void on_connect(uv_connect_t* connection, int status)
     state.tracingFlags = tracingFlags;
   });
 
-  client->observe("/log-streams", [ref = context->ref](std::string_view cmd) {
-    auto& state = ref.get<DeviceState>();
-    static constexpr int prefixSize = std::string_view{"/log-streams "}.size();
-    if (prefixSize > cmd.size()) {
-      LOG(error) << "Malformed log-streams request";
+  client->observe("/signpost:enable", [](std::string_view cmd) {
+    static constexpr int prefixSize = std::string_view{"/signpost:enable "}.size();
+    if (cmd.size() <= prefixSize) {
+      LOG(error) << "Malformed /signpost:enable request";
       return;
     }
-    cmd.remove_prefix(prefixSize);
-    int logStreams = 0;
+    std::string name(cmd.substr(prefixSize));
+    o2_walk_logs([](char const* logName, void* l, void* context) -> bool {
+      auto* log = static_cast<_o2_log_t*>(l);
+      auto* target = static_cast<std::string*>(context);
+      if (*target == logName) {
+        _o2_log_set_stacktrace(log, log->defaultStacktrace);
+        return false;
+      }
+      return true;
+    }, &name);
+  });
 
-    auto error = std::from_chars(cmd.data(), cmd.data() + cmd.size(), logStreams);
-    if (error.ec != std::errc()) {
-      LOG(error) << "Malformed log-streams mask";
+  client->observe("/signpost:disable", [](std::string_view cmd) {
+    static constexpr int prefixSize = std::string_view{"/signpost:disable "}.size();
+    if (cmd.size() <= prefixSize) {
+      LOG(error) << "Malformed /signpost:disable request";
       return;
     }
-    LOGP(info, "Logstreams flags set to {}", logStreams);
-    state.logStreams = logStreams;
-    if ((state.logStreams & DeviceState::LogStreams::DEVICE_LOG) != 0) {
-      O2_LOG_ENABLE(device);
-    } else {
-      O2_LOG_DISABLE(device);
-    }
-    if ((state.logStreams & DeviceState::LogStreams::COMPLETION_LOG) != 0) {
-      O2_LOG_ENABLE(completion);
-    } else {
-      O2_LOG_DISABLE(completion);
-    }
-    if ((state.logStreams & DeviceState::LogStreams::MONITORING_SERVICE_LOG) != 0) {
-      O2_LOG_ENABLE(monitoring_service);
-    } else {
-      O2_LOG_DISABLE(monitoring_service);
-    }
-    if ((state.logStreams & DeviceState::LogStreams::DATA_PROCESSOR_CONTEXT_LOG) != 0) {
-      O2_LOG_ENABLE(data_processor_context);
-    } else {
-      O2_LOG_DISABLE(data_processor_context);
-    }
-    if ((state.logStreams & DeviceState::LogStreams::STREAM_CONTEXT_LOG) != 0) {
-      O2_LOG_ENABLE(stream_context);
-    } else {
-      O2_LOG_DISABLE(stream_context);
-    }
+    std::string name(cmd.substr(prefixSize));
+    o2_walk_logs([](char const* logName, void* l, void* context) -> bool {
+      auto* log = static_cast<_o2_log_t*>(l);
+      auto* target = static_cast<std::string*>(context);
+      if (*target == logName) {
+        _o2_log_set_stacktrace(log, 0);
+        return false;
+      }
+      return true;
+    }, &name);
   });
 
   // Client will be filled in the line after. I can probably have a single

Framework/GUISupport/src/FrameworkGUIDeviceInspector.cxx

@@ -400,16 +400,25 @@ void displayDeviceInspector(DeviceSpec const& spec,
     }
   }
 
-  bool logsChanged = false;
   if (ImGui::CollapsingHeader("Signposts", ImGuiTreeNodeFlags_DefaultOpen)) {
-    logsChanged = ImGui::CheckboxFlags("Device", &control.logStreams, DeviceState::LogStreams::DEVICE_LOG);
-    logsChanged = ImGui::CheckboxFlags("Completion", &control.logStreams, DeviceState::LogStreams::COMPLETION_LOG);
-    logsChanged = ImGui::CheckboxFlags("Monitoring", &control.logStreams, DeviceState::LogStreams::MONITORING_SERVICE_LOG);
-    logsChanged = ImGui::CheckboxFlags("DataProcessorContext", &control.logStreams, DeviceState::LogStreams::DATA_PROCESSOR_CONTEXT_LOG);
-    logsChanged = ImGui::CheckboxFlags("StreamContext", &control.logStreams, DeviceState::LogStreams::STREAM_CONTEXT_LOG);
-    if (logsChanged && control.controller) {
-      std::string cmd = fmt::format("/log-streams {}", control.logStreams);
-      control.controller->write(cmd.c_str(), cmd.size());
+    static const struct {
+      const char* label;
+      int bit;
+      const char* fullName;
+    } kStreams[] = {
+      {"Device", DeviceState::LogStreams::DEVICE_LOG, "ch.cern.aliceo2.device"},
+      {"Completion", DeviceState::LogStreams::COMPLETION_LOG, "ch.cern.aliceo2.completion"},
+      {"Monitoring", DeviceState::LogStreams::MONITORING_SERVICE_LOG, "ch.cern.aliceo2.monitoring_service"},
+      {"DataProcessorContext", DeviceState::LogStreams::DATA_PROCESSOR_CONTEXT_LOG, "ch.cern.aliceo2.data_processor_context"},
+      {"StreamContext", DeviceState::LogStreams::STREAM_CONTEXT_LOG, "ch.cern.aliceo2.stream_context"},
+    };
+    for (auto const& s : kStreams) {
+      if (ImGui::CheckboxFlags(s.label, &control.logStreams, s.bit) && control.controller) {
+        bool enabled = (control.logStreams & s.bit) != 0;
+        std::string cmd = enabled ? fmt::format("/signpost:enable {}", s.fullName)
+                                  : fmt::format("/signpost:disable {}", s.fullName);
+        control.controller->write(cmd.c_str(), cmd.size());
+      }
     }
   }