fixup

stv0g · stv0g · commit 060fa378f520 · 2025-08-26T08:31:04.000+02:00
diff --git a/cmake/FindFileSystem.cmake b/cmake/FindFileSystem.cmake
@@ -18,4 +18,4 @@ cmake_push_check_state(RESET)
 check_cxx_source_compiles("${FILESYSTEM_TEST_CODE}" CXX17_FILESYSTEM)
 cmake_pop_check_state()
 
-unset(FILESYSTEM_TEST_CODE)
+unset(FILESYSTEM_TEST_CODE)
diff --git a/common/include/villas/fs.hpp b/common/include/villas/fs.hpp
@@ -7,9 +7,9 @@
 #include <villas/config.hpp>
 
 #ifdef WITH_GHC_FS
-    #include <ghc/filesystem.hpp>
-    namespace fs = ghc::filesystem;
+#include <ghc/filesystem.hpp>
+namespace fs = ghc::filesystem;
 #else
-    #include <filesystem>
-    namespace fs = std::filesystem;
-#endif
+#include <filesystem>
+namespace fs = std::filesystem;
+#endif
diff --git a/common/include/villas/kernel/devices/ip_device.hpp b/common/include/villas/kernel/devices/ip_device.hpp
@@ -24,9 +24,8 @@ class IpDevice : public PlatformDevice {
 
 private:
   IpDevice() = delete;
-  IpDevice(
-      const fs::path valid_path) //! Dont allow unvalidated paths
-      : PlatformDevice(valid_path){};
+  IpDevice(const fs::path valid_path) //! Dont allow unvalidated paths
+      : PlatformDevice(valid_path) {};
 
 public:
   size_t addr() const;
diff --git a/common/include/villas/kernel/devices/linux_driver.hpp b/common/include/villas/kernel/devices/linux_driver.hpp
@@ -33,12 +33,11 @@ class LinuxDriver : public Driver {
 public:
   LinuxDriver(const fs::path path)
       : LinuxDriver(path, path / fs::path(BIND_DEFAULT),
-                    path / fs::path(UNBIND_DEFAULT)){};
+                    path / fs::path(UNBIND_DEFAULT)) {};
 
-  LinuxDriver(const fs::path path,
-              const fs::path bind_path,
+  LinuxDriver(const fs::path path, const fs::path bind_path,
               const fs::path unbind_path)
-      : path(path), bind_path(bind_path), unbind_path(unbind_path){};
+      : path(path), bind_path(bind_path), unbind_path(unbind_path) {};
 
 public:
   void attach(const Device &device) const override;
diff --git a/common/include/villas/kernel/devices/platform_device.hpp b/common/include/villas/kernel/devices/platform_device.hpp
@@ -29,10 +29,9 @@ class PlatformDevice : public Device {
 public:
   PlatformDevice(const fs::path path)
       : PlatformDevice(path, fs::path(PROBE_DEFAULT),
-                       path / fs::path(OVERRIDE_DEFAULT)){};
+                       path / fs::path(OVERRIDE_DEFAULT)) {};
 
-  PlatformDevice(const fs::path path,
-                 const fs::path probe_path,
+  PlatformDevice(const fs::path path, const fs::path probe_path,
                  const fs::path override_path)
       : m_path(path), m_probe_path(probe_path),
         m_override_path(override_path){};
diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp
@@ -20,8 +20,8 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include <villas/fs.hpp>
 #include <villas/config.hpp>
+#include <villas/fs.hpp>
 
 #ifdef __GNUC__
 #define LIKELY(x) __builtin_expect((x), 1)
@@ -213,8 +213,7 @@ template <class... Ts> struct overloaded : Ts... {
 template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
 void write_to_file(std::string data, const fs::path file);
-std::vector<std::string>
-read_names_in_directory(const fs::path &directory);
+std::vector<std::string> read_names_in_directory(const fs::path &directory);
 
 namespace base64 {
 
diff --git a/common/lib/kernel/devices/device_connection.cpp b/common/lib/kernel/devices/device_connection.cpp
@@ -26,8 +26,7 @@ DeviceConnection DeviceConnection::from(
   auto logger = villas::Log::get("Builder: DeviceConnection");
 
   // Bind the devicetree device to vfio driver
-  LinuxDriver driver(
-      fs::path("/sys/bus/platform/drivers/vfio-platform"));
+  LinuxDriver driver(fs::path("/sys/bus/platform/drivers/vfio-platform"));
   driver.attach(device);
 
   // Attach vfio container to the iommu group
diff --git a/common/lib/kernel/devices/ip_device.cpp b/common/lib/kernel/devices/ip_device.cpp
@@ -9,8 +9,8 @@
 #include <regex>
 #include <stdexcept>
 
-#include <villas/fs.hpp>
 #include <villas/exceptions.hpp>
+#include <villas/fs.hpp>
 #include <villas/kernel/devices/ip_device.hpp>
 #include <villas/utils.hpp>
 
@@ -62,8 +62,7 @@ IpDevice::from_directory(fs::path devices_directory) {
       villas::utils::read_names_in_directory(devices_directory);
 
   for (auto devicetree_name : devicetree_names) {
-    auto path_to_device =
-        devices_directory / fs::path(devicetree_name);
+    auto path_to_device = devices_directory / fs::path(devicetree_name);
     try {
       auto device = villas::kernel::devices::IpDevice::from(path_to_device);
       devices.push_back(device);
diff --git a/common/lib/kernel/devices/platform_device.cpp b/common/lib/kernel/devices/platform_device.cpp
@@ -15,20 +15,17 @@ using villas::kernel::devices::PlatformDevice;
 using villas::utils::write_to_file;
 
 std::optional<std::unique_ptr<Driver>> PlatformDevice::driver() const {
-  fs::path driver_symlink =
-      this->m_path / fs::path("driver");
+  fs::path driver_symlink = this->m_path / fs::path("driver");
 
   if (!fs::is_symlink(driver_symlink))
     return std::nullopt;
 
-  fs::path driver_path =
-      fs::canonical(driver_symlink);
+  fs::path driver_path = fs::canonical(driver_symlink);
   return std::make_optional(std::make_unique<LinuxDriver>(driver_path));
 }
 
 std::optional<int> PlatformDevice::iommu_group() const {
-  fs::path symlink =
-      fs::path(this->m_path.u8string() + "/iommu_group");
+  fs::path symlink = fs::path(this->m_path.u8string() + "/iommu_group");
 
   fs::path link = fs::read_symlink(symlink);
   std::string delimiter = "iommu_groups/";
@@ -43,8 +40,6 @@ void PlatformDevice::probe() const {
   write_to_file(this->name(), this->m_probe_path);
 }
 
-fs::path PlatformDevice::override_path() const {
-  return this->m_override_path;
-}
+fs::path PlatformDevice::override_path() const { return this->m_override_path; }
 
 std::string PlatformDevice::name() const { return this->m_path.filename(); }
diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp
@@ -27,10 +27,10 @@
 #include <pthread.h>
 #include <unistd.h>
 
-#include <villas/fs.hpp>
 #include <villas/colors.hpp>
 #include <villas/config.hpp>
 #include <villas/exceptions.hpp>
+#include <villas/fs.hpp>
 #include <villas/log.hpp>
 #include <villas/utils.hpp>
 
@@ -362,13 +362,11 @@ void write_to_file(std::string data, const fs::path file) {
     outputFile << data;
     outputFile.close();
   } else {
-    throw fs::filesystem_error("Cannot open outputfile",
-                                            std::error_code());
+    throw fs::filesystem_error("Cannot open outputfile", std::error_code());
   }
 }
 
-std::vector<std::string>
-read_names_in_directory(const fs::path &directory) {
+std::vector<std::string> read_names_in_directory(const fs::path &directory) {
   std::vector<std::string> names;
   for (auto const &dir_entry : fs::directory_iterator{directory}) {
     names.push_back(dir_entry.path().filename());
diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp
@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include <villas/fs.hpp>
 #include <villas/fpga/core.hpp>
+#include <villas/fs.hpp>
 #include <villas/kernel/vfio_container.hpp>
 
 namespace villas {
diff --git a/fpga/include/villas/fpga/pcie_card.hpp b/fpga/include/villas/fpga/pcie_card.hpp
@@ -16,10 +16,10 @@
 
 #include <jansson.h>
 
-#include <villas/fs.hpp>
 #include <villas/fpga/card.hpp>
 #include <villas/fpga/config.h>
 #include <villas/fpga/core.hpp>
+#include <villas/fs.hpp>
 #include <villas/kernel/devices/pci_device.hpp>
 #include <villas/kernel/vfio_container.hpp>
 #include <villas/memory.hpp>
@@ -64,8 +64,7 @@ class PCIeCardFactory : public plugin::Plugin {
 public:
   static std::shared_ptr<PCIeCard>
   make(json_t *json, std::string card_name,
-       std::shared_ptr<kernel::vfio::Container> vc,
-       const fs::path &searchPath);
+       std::shared_ptr<kernel::vfio::Container> vc, const fs::path &searchPath);
 
   static PCIeCard *make() { return new PCIeCard(); }
 
diff --git a/fpga/include/villas/fpga/platform_card.hpp b/fpga/include/villas/fpga/platform_card.hpp
@@ -14,9 +14,9 @@
 
 #include <vector>
 
-#include <villas/fs.hpp>
 #include <villas/fpga/card.hpp>
 #include <villas/fpga/core_connection.hpp>
+#include <villas/fs.hpp>
 
 namespace villas {
 namespace fpga {
@@ -38,8 +38,7 @@ class PlatformCardFactory {
 public:
   static std::shared_ptr<PlatformCard>
   make(json_t *json_card, std::string card_name,
-       std::shared_ptr<kernel::vfio::Container> vc,
-       const fs::path &searchPath);
+       std::shared_ptr<kernel::vfio::Container> vc, const fs::path &searchPath);
 };
 
 } /* namespace fpga */
diff --git a/fpga/lib/card.cpp b/fpga/lib/card.cpp
@@ -140,8 +140,7 @@ void CardFactory::loadIps(std::shared_ptr<Card> card, json_t *json_ips,
   }
 
   if (!searchPath.empty()) {
-    fs::path json_ips_path =
-        searchPath / json_string_value(json_ips);
+    fs::path json_ips_path = searchPath / json_string_value(json_ips);
     logger->debug("searching for FPGA IP cors config at {}",
                   json_ips_path.string());
     json_ips = json_load_file(json_ips_path.c_str(), 0, nullptr);
diff --git a/fpga/lib/core_connection.cpp b/fpga/lib/core_connection.cpp
@@ -26,8 +26,7 @@ CoreConnection
 CoreConnection::from(std::shared_ptr<villas::fpga::ip::Core> ip,
                      std::shared_ptr<kernel::vfio::Container> vfio_container) {
   // Find matching OS device for ip
-  const fs::path PLATFORM_DEVICES_DIRECTORY(
-      "/sys/bus/platform/devices");
+  const fs::path PLATFORM_DEVICES_DIRECTORY("/sys/bus/platform/devices");
   std::vector<villas::kernel::devices::IpDevice> devices =
       villas::kernel::devices::IpDevice::from_directory(
           PLATFORM_DEVICES_DIRECTORY);
diff --git a/fpga/lib/utils.cpp b/fpga/lib/utils.cpp
@@ -15,7 +15,6 @@
 #include <jansson.h>
 #include <rang.hpp>
 
-#include <villas/fs.hpp>
 #include <villas/exceptions.hpp>
 #include <villas/fpga/card.hpp>
 #include <villas/fpga/core.hpp>
@@ -26,6 +25,7 @@
 #include <villas/fpga/platform_card.hpp>
 #include <villas/fpga/utils.hpp>
 #include <villas/fpga/vlnv.hpp>
+#include <villas/fs.hpp>
 #include <villas/log.hpp>
 #include <villas/utils.hpp>
 
diff --git a/fpga/thirdparty/ghc_filesystem/ghc_filesystem.hpp b/fpga/thirdparty/ghc_filesystem/ghc_filesystem.hpp
