Merge pull request #41 from DUNE-DAQ/gcrone/listApps-enhancements

Gcrone/list apps enhancements

apps/list_apps.cxx

@@ -10,65 +10,126 @@
 #include "confmodel/Session.hpp"
 
 #include <iostream>
+//#include <set>
 #include <string>
 
 using namespace dunedaq;
 
 
 void process_segment(const confmodel::Session* session,
-                     const confmodel::Segment* segment) {
-  bool disabled = segment->disabled(*session);
+                     const confmodel::Segment* segment,
+                     const std::set<std::string>& disabled_objects,
+                     std::string spacer) {
+  std::cout << spacer << "Segment " << segment->UID();
+  bool segment_disabled = segment->disabled(*session);
+  std::string reason = "";
+  if (segment_disabled) {
+    std::cout << " disabled";
+    reason = "segment";
+  }
+  std::cout << "\n";
   for (auto subseg : segment->get_segments()) {
-    process_segment (session, subseg);
+    process_segment (session, subseg, disabled_objects, spacer+"  ");
   }
+
   for (auto app : segment->get_applications()) {
-    std::cout << "Application: " << app->UID();
-    if (disabled) {
-      std::cout << "<disabled segment>";
-    }
-    else {
-      auto res = app->cast<confmodel::ResourceSet>();
-      if (res) {
-        if (res->disabled(*session)) {
-          std::cout << "<disabled>";
+    bool disabled = segment_disabled;
+    std::cout << spacer << "  Application: " << app->UID();
+    if (!disabled) {
+      auto rset = app->cast<confmodel::ResourceSet>();
+      if (rset) {
+        if (rset->disabled(*session)) {
+          disabled = true;
+          if (disabled_objects.find(app->UID()) != disabled_objects.end()) {
+            reason = "directly";
+          }
+          else {
+            reason = "due to state of related objects";
+          }
         }
-        else {
-          for (auto mod : res->get_contains()) {
-            std::cout << " " << mod->UID();
-            if (mod->disabled(*session)) {
-              std::cout << "<disabled>";
+        std::cout << " contains: {";
+        std::string seperator = "";
+        for (auto mod : rset->get_contains()) {
+          std::cout << seperator << mod->UID();
+          if (mod->disabled(*session)) {
+            std::cout << "<disabled ";
+            if (disabled_objects.find(mod->UID()) == disabled_objects.end()) {
+              std::cout << "in";
             }
+            std::cout << "directly>";
           }
+          seperator = ", ";
         }
+        std::cout << "}";
       }
     }
+    if (disabled) {
+      std::cout << " <disabled "<< reason << ">";
+    }
     auto daqApp = app->cast<confmodel::DaqApplication>();
     if (daqApp) {
       std::cout << " Modules:";
       for (auto mod : daqApp->get_modules()) {
         std::cout << " " << mod->UID();
       }
     }
+
     std::cout << std::endl;
   }
 }
 
 int main(int argc, char* argv[]) {
   dunedaq::logging::Logging::setup();
 
-  if (argc < 3) {
-    std::cout << "Usage: " << argv[0] << " session database-file\n";
+  if (argc < 2) {
+    std::cout << "Usage: " << argv[0] << " [session] database-file\n";
     return 0;
   }
-  std::string confimpl = "oksconflibs:" + std::string(argv[2]);
+
+  int filearg = 1;
+  if (argc == 3) {
+    filearg = 2;
+  }
+  std::string confimpl = "oksconflibs:" + std::string(argv[filearg]);
   auto confdb = new conffwk::Configuration(confimpl);
 
-  std::string sessionName(argv[1]);
-  auto session = confdb->get<confmodel::Session>(sessionName);
-  if (session==nullptr) {
-    std::cerr << "Session " << sessionName << " not found in database\n";
-    return -1;
+  std::vector<std::string> sessionList;
+  if (argc == 3) {
+    sessionList.emplace_back(std::string(argv[1]));
+  }
+  else {
+    std::vector<conffwk::ConfigObject> session_obj;
+    confdb->get("Session", session_obj);
+    if (session_obj.size() == 0) {
+      std::cerr << "Can't find any Sessions in database\n";
+      return -1;
+    }
+    for (auto obj : session_obj) {
+      sessionList.push_back(obj.UID());
+    }
   }
 
-  process_segment (session, session->get_segment());
+  std::string separator{};
+  for (const auto& sessionName : sessionList) {
+    const confmodel::Session* session;
+    session = confdb->get<confmodel::Session>(sessionName);
+    if (session==nullptr) {
+      std::cerr << "Session " << sessionName << " not found in database\n";
+      return -1;
+    }
+
+    std::cout << separator << "      Applications in Session: "
+              << sessionName << "\n";
+    std::set<std::string> disabled_objects;
+    for (auto object : session->get_disabled()) {
+      TLOG_DEBUG(11) << object->UID() << " is in disabled list of Session";
+      disabled_objects.insert(object->UID());
+    }
+
+    process_segment (session, session->get_segment(),
+                     disabled_objects,
+                     "");
+    separator =
+      "\n   ----------------------------------------------\n\n";
+  }
 }