C37.118 Synchrophasor Node Reloaded

CMakeLists.txt

@@ -78,6 +78,7 @@ find_package(OpenSSL 1.0.0 REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(Threads REQUIRED)
+find_package(nlohmann_json REQUIRED)
 find_package(OpenMP)
 find_package(IBVerbs)
 find_package(RDMACM)

common/include/villas/json.hpp

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <fmt/ostream.h>
+#include <nlohmann/json_fwd.hpp>
+
+#include <villas/fs.hpp>
+
+namespace villas {
+
+using Json = nlohmann::json;
+using JsonPointer = nlohmann::json_pointer<std::string>;
+
+// forward declaration for villas/jansson.hpp compatibility header
+class JanssonPtr;
+void to_json(Json &json, JanssonPtr const &jansson);
+void from_json(Json const &json, JanssonPtr &jansson);
+
+// load a configuration file
+Json load_config_deprecated(fs::path const &path, bool resolve_inc,
+                            bool resolve_env);
+
+}; // namespace villas
+
+// forward declaration for libjansson's json_t
+struct json_t;
+void to_json(villas::Json &json, json_t const *jansson);
+
+template <> // format config_json using operator<<
+struct fmt::formatter<villas::Json> : ostream_formatter {};
+
+template <> // format config_json_pointer using operator<<
+struct fmt::formatter<villas::JsonPointer> : ostream_formatter {};

common/include/villas/utils.hpp

@@ -131,6 +131,10 @@ template <class... Ts> struct overloaded : Ts... {
 // Explicit deduction guide (not needed as of C++20)
 template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
+// glob-style filesystem pattern matching
+std::vector<fs::path> glob(fs::path const &pattern,
+                           std::span<const fs::path> searchDirectories);
+
 void write_to_file(std::string data, const fs::path file);
 
 namespace base64 {

common/lib/CMakeLists.txt

@@ -15,6 +15,7 @@ add_library(villas-common SHARED
     cpuset.cpp
     dsp/pid.cpp
     hist.cpp
+    json.cpp
     kernel/kernel.cpp
     kernel/rt.cpp
     list.cpp
@@ -55,6 +56,7 @@ target_include_directories(villas-common PUBLIC
 )
 
 target_link_libraries(villas-common PUBLIC
+    nlohmann_json::nlohmann_json
     PkgConfig::JANSSON
     PkgConfig::UUID
     ${OPENSSL_LIBRARIES}