gpu_fdinfo: fix formatting

Author: 17314642

src/gpu_fdinfo.cpp

@@ -1,7 +1,8 @@
 #include "gpu_fdinfo.h"
 namespace fs = ghc::filesystem;
 
-void GPU_fdinfo::find_fd() {
+void GPU_fdinfo::find_fd()
+{
     auto path = fs::path("/proc/self/fdinfo");
 
     if (!fs::exists(path)) {
@@ -33,7 +34,8 @@ void GPU_fdinfo::find_fd() {
         fdinfo.push_back(std::ifstream(fd));
 }
 
-uint64_t GPU_fdinfo::get_gpu_time() {
+uint64_t GPU_fdinfo::get_gpu_time()
+{
     uint64_t total_val = 0;
 
     for (auto& fd : fdinfo) {
@@ -52,7 +54,8 @@ uint64_t GPU_fdinfo::get_gpu_time() {
     return total_val;
 }
 
-float GPU_fdinfo::get_vram_usage() {
+float GPU_fdinfo::get_vram_usage()
+{
     uint64_t total_val = 0;
 
     for (auto& fd : fdinfo) {
@@ -71,7 +74,8 @@ float GPU_fdinfo::get_vram_usage() {
     return (float)total_val / 1024 / 1024;
 }
 
-void GPU_fdinfo::find_intel_hwmon() {
+void GPU_fdinfo::find_intel_hwmon()
+{
     std::string device = "/sys/bus/pci/devices/";
     device += pci_dev;
     device += "/hwmon";
@@ -104,7 +108,8 @@ void GPU_fdinfo::find_intel_hwmon() {
         SPDLOG_DEBUG("Intel hwmon: failed to open {}", hwmon);
 }
 
-float GPU_fdinfo::get_power_usage() {
+float GPU_fdinfo::get_power_usage()
+{
     if (!energy_stream.is_open())
         return 0.f;
 
@@ -123,7 +128,8 @@ float GPU_fdinfo::get_power_usage() {
     return (float)energy_input / 1'000'000;
 }
 
-void GPU_fdinfo::get_load() {
+void GPU_fdinfo::get_load()
+{
     while (!stop_thread) {
         std::unique_lock<std::mutex> lock(metrics_mutex);
         cond_var.wait(lock, [this]() { return !paused || stop_thread; });

src/gpu_fdinfo.h

@@ -1,71 +1,77 @@
 #pragma once
-#include <sys/stat.h>
-#include <thread>
 #include <filesystem.h>
 #include <inttypes.h>
+#include <sys/stat.h>
+#include <thread>
 #ifdef TEST_ONLY
 #include <../src/mesa/util/os_time.h>
 #else
 #include <mesa/util/os_time.h>
 #endif
-#include <spdlog/spdlog.h>
 #include "gpu_metrics_util.h"
 #include <atomic>
+#include <spdlog/spdlog.h>
 
 class GPU_fdinfo {
-    private:
-        bool init = false;
-        struct gpu_metrics metrics;
-        std::vector<std::ifstream> fdinfo;
-        const std::string module;
-        const std::string pci_dev;
-        void find_fd();
-        void find_intel_hwmon();
-        std::ifstream energy_stream;
-        std::thread thread;
-        std::condition_variable cond_var;
-        std::atomic<bool> stop_thread{false};
-        std::atomic<bool> paused{false};
-        mutable std::mutex metrics_mutex;
+private:
+    bool init = false;
+    struct gpu_metrics metrics;
+    std::vector<std::ifstream> fdinfo;
+    const std::string module;
+    const std::string pci_dev;
+    void find_fd();
+    void find_intel_hwmon();
+    std::ifstream energy_stream;
+    std::thread thread;
+    std::condition_variable cond_var;
+    std::atomic<bool> stop_thread { false };
+    std::atomic<bool> paused { false };
+    mutable std::mutex metrics_mutex;
 
-        uint64_t get_gpu_time();
-        void get_load();
-        std::string drm_engine_type = "EMPTY";
-        std::string drm_memory_type = "EMPTY";
-        float get_vram_usage();
-        float get_power_usage();
+    uint64_t get_gpu_time();
+    void get_load();
+    std::string drm_engine_type = "EMPTY";
+    std::string drm_memory_type = "EMPTY";
+    float get_vram_usage();
+    float get_power_usage();
 
-    public:
-        GPU_fdinfo(const std::string module, const std::string pci_dev) : module(module), pci_dev(pci_dev) {
-            if (module == "i915") {
-                drm_engine_type = "drm-engine-render";
-                drm_memory_type = "drm-total-local0";
-                find_intel_hwmon();
-            } else if (module == "amdgpu") {
-                drm_engine_type = "drm-engine-gfx";
-                drm_memory_type = "drm-memory-vram";
-            } else if (module == "msm") {
-                // msm driver does not report vram usage
-                drm_engine_type = "drm-engine-gpu";
-            }
+public:
+    GPU_fdinfo(const std::string module, const std::string pci_dev)
+        : module(module)
+        , pci_dev(pci_dev)
+    {
+        if (module == "i915") {
+            drm_engine_type = "drm-engine-render";
+            drm_memory_type = "drm-total-local0";
+            find_intel_hwmon();
+        } else if (module == "amdgpu") {
+            drm_engine_type = "drm-engine-gfx";
+            drm_memory_type = "drm-memory-vram";
+        } else if (module == "msm") {
+            // msm driver does not report vram usage
+            drm_engine_type = "drm-engine-gpu";
+        }
 
-            find_fd();
+        find_fd();
 
-            std::thread thread(&GPU_fdinfo::get_load, this);
-            thread.detach();
-        }
+        std::thread thread(&GPU_fdinfo::get_load, this);
+        thread.detach();
+    }
 
-        gpu_metrics copy_metrics() const {
-            return metrics;
-        };
+    gpu_metrics copy_metrics() const
+    {
+        return metrics;
+    };
 
-        void pause() {
-            paused = true;
-            cond_var.notify_one();
-        }
+    void pause()
+    {
+        paused = true;
+        cond_var.notify_one();
+    }
 
-        void resume() {
-            paused = false;
-            cond_var.notify_one();
-        }
+    void resume()
+    {
+        paused = false;
+        cond_var.notify_one();
+    }
 };