Merge pull request #48218 from wddgit/removeSubProcessFromFastTimerService

Remove SubProcess related code from FastTimerService

Author: cmsbuild

HLTrigger/Timer/interface/ProcessCallGraph.h

@@ -1,15 +1,10 @@
 #ifndef HLTrigger_Timer_interface_ProcessCallGraph_h
 #define HLTrigger_Timer_interface_ProcessCallGraph_h
 
-/*
- *
- */
-
-#include <iostream>
+#include <memory>
 #include <utility>
 #include <vector>
 #include <string>
-#include <type_traits>
 
 // boost optional (used by boost graph) results in some false positives with -Wmaybe-uninitialized
 #pragma GCC diagnostic push
@@ -20,15 +15,14 @@
 #pragma GCC diagnostic pop
 
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
-#include "FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h"
-#include "FWCore/ServiceRegistry/interface/ProcessContext.h"
+#include "FWCore/ServiceRegistry/interface/ServiceRegistryfwd.h"
 #include "HLTrigger/Timer/interface/EDMModuleType.h"
 
 class ProcessCallGraph {
 public:
   struct NodeType {
     edm::ModuleDescription module_;
-    edm::EDMModuleType type_;
+    edm::EDMModuleType type_ = edm::EDMModuleType::kUnknown;
     bool scheduled_ = false;
   };
 
@@ -64,61 +58,28 @@ class ProcessCallGraph {
           modules_on_path_(std::move(mop)),
           modules_and_dependencies_(std::move(mad)),
           last_dependency_of_module_(std::move(ldom)) {}
-
-    PathType(PathType const &other) = default;
-
-    PathType(PathType &&other) = default;
-
-    ~PathType() = default;
-
-    PathType &operator=(PathType const &other) = default;
   };
 
-  // store the details of each process: name, modules call subgraph, modules, paths and endpaths, subprocess pids
+  // store the details of the process: name, modules call subgraph, modules, paths and endpaths
   struct ProcessType {
     std::string name_;
     GraphType const &graph_;
     std::vector<unsigned int> modules_;
     std::vector<PathType> paths_;
     std::vector<PathType> endPaths_;
-    std::vector<unsigned int> subprocesses_;
-
-    ProcessType() = delete;
 
     ProcessType(std::string name,
                 GraphType const &graph,
                 std::vector<unsigned int> modules,
                 std::vector<PathType> paths,
-                std::vector<PathType> endPaths,
-                std::vector<unsigned int> subprocesses = {})
-        : name_(std::move(name)),
-          graph_(graph),
-          modules_(std::move(modules)),
-          paths_(std::move(paths)),
-          endPaths_(std::move(endPaths)),
-          subprocesses_(std::move(subprocesses)) {}
-
-    ProcessType(std::string &&name,
-                GraphType const &graph,
-                std::vector<unsigned int> &&modules,
-                std::vector<PathType> &&paths,
-                std::vector<PathType> &&endPaths,
-                std::vector<unsigned int> &&subprocesses = {})
+                std::vector<PathType> endPaths)
         : name_(std::move(name)),
           graph_(graph),
           modules_(std::move(modules)),
           paths_(std::move(paths)),
-          endPaths_(std::move(endPaths)),
-          subprocesses_(std::move(subprocesses)) {}
-
-    ProcessType(ProcessType const &other) = default;
-    ProcessType(ProcessType &&other) = default;
-
-    ProcessType &operator=(ProcessType const &other) = delete;
-    ProcessType &operator=(ProcessType &&other) = delete;
+          endPaths_(std::move(endPaths)) {}
   };
 
-public:
   // default c'tor
   ProcessCallGraph() = default;
 
@@ -146,39 +107,17 @@ class ProcessCallGraph {
   // find the dependencies of all modules in the given path
   std::pair<std::vector<unsigned int>, std::vector<unsigned int>> dependencies(std::vector<unsigned int> const &path);
 
-  // retrieve the "process id" of a process, given its ProcessContex
-  unsigned int processId(edm::ProcessContext const &) const;
-
-  // retrieve the "process id" of a process, given its name
-  unsigned int processId(std::string const &) const;
-
-  // retrieve the processes
-  std::vector<ProcessType> const &processes() const;
-
-  // retrieve information about a process, given its "process id"
-  ProcessType const &processDescription(unsigned int) const;
-
-  // retrieve information about a process, given its ProcessContex
-  ProcessType const &processDescription(edm::ProcessContext const &) const;
-
-  // retrieve information about a process, given its name
-  ProcessType const &processDescription(std::string const &) const;
-
-private:
-  // register a (sub)process and assigns it a "process id"
-  unsigned int registerProcess(edm::ProcessContext const &);
+  // retrieve information about the process
+  ProcessType const &processDescription() const;
 
 private:
   GraphType graph_;
 
   // module id of the Source
   unsigned int source_ = edm::ModuleDescription::invalidID();
 
-  // map each (sub)process name to a "process id"
-  std::unordered_map<std::string, unsigned int> process_id_;
-
-  // description of each process
-  std::vector<ProcessType> process_description_;
+  // description of the process
+  std::unique_ptr<ProcessType> process_description_;
 };
 
 #endif  // not defined HLTrigger_Timer_interface_ProcessCallGraph_h