Remove cyclic dependency between phasar_utils and phasar_config

Author: fabianbs96

include/phasar/Utils/PAMM.h

@@ -17,6 +17,8 @@
 #ifndef PHASAR_UTILS_PAMM_H_
 #define PHASAR_UTILS_PAMM_H_
 
+#include "boost/program_options/variables_map.hpp"
+
 #include <chrono>        // high_resolution_clock::time_point, milliseconds
 #include <set>           // set
 #include <string>        // string
@@ -25,7 +27,7 @@
 
 namespace llvm {
 class raw_ostream;
-}
+} // namespace llvm
 
 namespace psr {
 
@@ -188,7 +190,8 @@ class PAMM {
   /// \brief Exports the measured data to JSON - associated macro:
   /// EXPORT_MEASURED_DATA(PATH).
   /// \param OutputPath to exported JSON file.
-  void exportMeasuredData(std::string OutputPath);
+  void exportMeasuredData(std::string OutputPath,
+                          boost::program_options::variables_map &Config);
 };
 
 } // namespace psr

include/phasar/Utils/Utilities.h

@@ -162,9 +162,8 @@ struct StringIDLess {
 template <typename Fn> class scope_exit { // NOLINT
 public:
   template <typename FFn, typename = decltype(std::declval<FFn>()())>
-  explicit scope_exit(FFn &&F) noexcept(
-      std::is_nothrow_constructible_v<Fn, FFn> ||
-      std::is_nothrow_constructible_v<Fn, FFn &>)
+  scope_exit(FFn &&F) noexcept(std::is_nothrow_constructible_v<Fn, FFn> ||
+                               std::is_nothrow_constructible_v<Fn, FFn &>)
       : F(std::forward<FFn>(F)) {}
 
   ~scope_exit() { F(); }

lib/Config/CMakeLists.txt

@@ -1,5 +1,9 @@
 file(GLOB_RECURSE CONFIG_SRC *.h *.cpp)
 
+set(PHASAR_LINK_LIBS
+  phasar_utils
+)
+
 set(LLVM_LINK_COMPONENTS
   Support
 )

lib/Utils/CMakeLists.txt

@@ -7,7 +7,6 @@ if(PHASAR_ENABLE_PAMM STREQUAL "Off" AND NOT PHASAR_BUILD_UNITTESTS)
 endif()
 
 set(PHASAR_LINK_LIBS
-  phasar_config
 )
 
 set(LLVM_LINK_COMPONENTS

lib/Utils/PAMM.cpp

@@ -24,7 +24,6 @@
 
 #include "nlohmann/json.hpp"
 
-#include "phasar/Config/Configuration.h"
 #include "phasar/Utils/PAMM.h"
 
 using namespace psr;
@@ -274,7 +273,8 @@ void PAMM::printMeasuredData(llvm::raw_ostream &Os) {
   Os << "\n----- END OF EVALUATION DATA -----\n\n";
 }
 
-void PAMM::exportMeasuredData(std::string OutputPath) {
+void PAMM::exportMeasuredData(std::string OutputPath,
+                              boost::program_options::variables_map &Config) {
   // json file for holding all data
   json JsonData;
 
@@ -313,18 +313,15 @@ void PAMM::exportMeasuredData(std::string OutputPath) {
 
   // add analysis/project/source file information if available
   json JInfo;
-  if (PhasarConfig::VariablesMap().count("project-id")) {
-    JInfo["Project-ID"] =
-        PhasarConfig::VariablesMap()["project-id"].as<std::string>();
+  if (Config.count("project-id")) {
+    JInfo["Project-ID"] = Config["project-id"].as<std::string>();
   }
-  if (PhasarConfig::VariablesMap().count("module")) {
-    JInfo["Module(s)"] =
-        PhasarConfig::VariablesMap()["module"].as<std::vector<std::string>>();
+  if (Config.count("module")) {
+    JInfo["Module(s)"] = Config["module"].as<std::vector<std::string>>();
   }
-  if (PhasarConfig::VariablesMap().count("data-flow-analysis")) {
+  if (Config.count("data-flow-analysis")) {
     JInfo["Data-flow analysis"] =
-        PhasarConfig::VariablesMap()["data-flow-analysis"]
-            .as<std::vector<std::string>>();
+        Config["data-flow-analysis"].as<std::vector<std::string>>();
   }
   if (!JInfo.is_null()) {
     JsonData["Info"] = JInfo;

unittests/Utils/PAMMTest.cpp

@@ -1,9 +1,12 @@
 #include "phasar/Utils/PAMM.h"
+#include "phasar/Config/Configuration.h"
+
 #include "gtest/gtest.h"
-#include <thread>
 
 #include "llvm/Support/raw_ostream.h"
 
+#include <thread>
+
 using namespace psr;
 
 /* Test fixture */
@@ -100,7 +103,7 @@ TEST_F(PAMMTest, HandleJSONOutput) {
   Pamm.addToHistogram("Test-Set", "2");
   Pamm.incCounter("setOpCount", 9);
   Pamm.stopTimer("timer3");
-  Pamm.exportMeasuredData("HandleJSONOutputTest");
+  Pamm.exportMeasuredData("HandleJSONOutputTest", PhasarConfig::VariablesMap());
 }
 
 TEST_F(PAMMTest, DISABLED_PerformanceTimerBasic) {