DPL: drop some more code from the main header

AliceO2Group · Mar 8, 2024 · 473b958 · 473b958
1 parent 96e0e44
commit 473b958
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Framework/Core/include/Framework/runDataProcessing.h b/Framework/Core/include/Framework/runDataProcessing.h
@@ -31,7 +31,6 @@
 #include "Framework/StructToTuple.h"
 
 #include <vector>
-#include <cstring>
 
 namespace o2::framework
 {
@@ -211,6 +210,7 @@ int mainNoCatch(int argc, char** argv)
 }
 
 int callMain(int argc, char** argv, int (*)(int, char**));
+char *getIdString(int argc, char** argv);
 
 int main(int argc, char** argv)
 {
@@ -219,13 +219,7 @@ int main(int argc, char** argv)
 
   int result = callMain(argc, argv, mainNoCatch);
 
-  char* idstring = nullptr;
-  for (int argi = 0; argi < argc; argi++) {
-    if (strcmp(argv[argi], "--id") == 0 && argi + 1 < argc) {
-      idstring = argv[argi + 1];
-      break;
-    }
-  }
+  char* idstring = getIdString(argc, argv);
   o2::framework::OnWorkflowTerminationHook onWorkflowTerminationHook;
   UserCustomizationsHelper::userDefinedCustomization(onWorkflowTerminationHook, 0);
   onWorkflowTerminationHook(idstring);

diff --git a/Framework/Core/src/runDataProcessing.cxx b/Framework/Core/src/runDataProcessing.cxx
@@ -182,6 +182,15 @@ void doBoostException(boost::exception& e, const char*);
 void doDPLException(o2::framework::RuntimeErrorRef& ref, char const*);
 void doUnknownException(std::string const& s, char const*);
 
+char *getIdString(int argc, char** argv) {
+  for (int argi = 0; argi < argc; argi++) {
+    if (strcmp(argv[argi], "--id") == 0 && argi + 1 < argc) {
+      return argv[argi + 1];
+    }
+  }
+  return nullptr;
+}
+
 int callMain(int argc, char** argv, int (*mainNoCatch)(int, char**))
 {
   static bool noCatch = getenv("O2_NO_CATCHALL_EXCEPTIONS") && strcmp(getenv("O2_NO_CATCHALL_EXCEPTIONS"), "0");