Use libpci to retrieve some basic PCI data

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev \
         libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \
         libxnvctrl0 libxnvctrl-dev libcurl4-gnutls-dev libflatpak-dev libjson-glib-dev \
-        liblivechart-1-dev \
+        liblivechart-1-dev libpci-dev \
         meson valac sassc git
     - name: Build
       run: |

README.md

@@ -38,13 +38,13 @@ Monitor will be available from the Applications menu.
 If you plan to install WITH a wingpanel-indicator
 
 ```bash
-sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libwingpanel-dev
+sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev libwingpanel-dev
 ```
 
 Alternatively, if you plan to install WITHOUT a wingpanel-indicator
 
 ```bash
-sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev
+sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev
 ```
 
 

meson.build

@@ -12,7 +12,7 @@ libdir = join_paths(prefix, get_option('libdir'))
 icondir = join_paths(datadir, 'icons', 'hicolor')
 vapidir = meson.current_source_dir() / 'vapi/'
 
-add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language:'c')
+add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c')
 
 add_project_arguments(['--vapidir', vapidir], language: 'vala')
 add_project_arguments(['-DWNCK_I_KNOW_THIS_IS_UNSTABLE', '-w'], language: 'c')
@@ -38,35 +38,42 @@ app_dependencies = [
     dependency('flatpak'),
 
     # FIXME Bump required version to >= 1.10.0 when GTK 4 porting
-    dependency('livechart', version: '< 1.10.0', fallback: ['live-chart', 'livechart_dep']),
+    dependency(
+        'livechart',
+        version: '< 1.10.0',
+        fallback: ['live-chart', 'livechart_dep'],
+    ),
 
-    meson.get_compiler('c').find_library('m', required : false),
+    meson.get_compiler('c').find_library('m', required: false),
     meson.get_compiler('vala').find_library('posix'),
-    meson.get_compiler('c').find_library('XNVCtrl'),
     meson.get_compiler('c').find_library('X11'),
+
+    # PCI needs lower version limit '>= 3.8.0'
+    meson.get_compiler('c').find_library('pci'),
+    meson.get_compiler('vala').find_library('pci', dirs: vapidir),
+
+    meson.get_compiler('c').find_library('XNVCtrl'),
     meson.get_compiler('vala').find_library('libxnvctrl', dirs: vapidir),
 ]
 
-
 config_data = configuration_data()
 config_data.set('GETTEXT_PACKAGE', meson.project_name())
 
 subdir('data')
 
 config_data.set('VCS_TAG', '@VCS_TAG@')
 project_config = vcs_tag(
-  input: configure_file(
-    input: 'src/Conf.vala.in',
-    output: 'Conf.vala.in',
-    configuration: config_data
-  ),
-  output: 'Conf.vala',
-  command: ['git', 'describe', '--tags', '--dirty']
+    input: configure_file(
+        input: 'src/Conf.vala.in',
+        output: 'Conf.vala.in',
+        configuration: config_data,
+    ),
+    output: 'Conf.vala',
+    command: ['git', 'describe', '--tags', '--dirty'],
 )
 
 subdir('src')
 
-
 # Add in a post install script
 meson.add_install_script('meson/post_install.py')
 

src/Monitor.vala

@@ -23,7 +23,7 @@ namespace Monitor {
             Object (
                 application_id: "io.elementary.monitor",
                 flags : ApplicationFlags.FLAGS_NONE
-            );
+                );
             status_background = status_indicator;
         }
 
@@ -70,21 +70,21 @@ namespace Monitor {
                 if (!MonitorApp.settings.get_boolean ("indicator-state")) {
                     MonitorApp.settings.set_boolean ("indicator-state", true);
                 }
-                //  if (!MonitorApp.settings.get_boolean ("indicator-cpu-state")) {
-                //      MonitorApp.settings.set_boolean ("indicator-cpu-state", true);
-                //  }
-                //  if (!MonitorApp.settings.get_boolean ("indicator-memory-state")) {
-                //      MonitorApp.settings.set_boolean ("indicator-memory-state", true);
-                //  }
-                //  if (!MonitorApp.settings.get_boolean ("indicator-temperature-state")) {
-                //      MonitorApp.settings.set_boolean ("indicator-temperature-state", true);
-                //  }
-                //  if (!MonitorApp.settings.get_boolean ("indicator-network-upload-state")) {
-                //      MonitorApp.settings.set_boolean ("indicator-network-upload-state", false);
-                //  }
-                //  if (!MonitorApp.settings.get_boolean ("indicator-network-download-state")) {
-                //      MonitorApp.settings.set_boolean ("indicator-network-download-state", false);
-                //  }
+                // if (!MonitorApp.settings.get_boolean ("indicator-cpu-state")) {
+                // MonitorApp.settings.set_boolean ("indicator-cpu-state", true);
+                // }
+                // if (!MonitorApp.settings.get_boolean ("indicator-memory-state")) {
+                // MonitorApp.settings.set_boolean ("indicator-memory-state", true);
+                // }
+                // if (!MonitorApp.settings.get_boolean ("indicator-temperature-state")) {
+                // MonitorApp.settings.set_boolean ("indicator-temperature-state", true);
+                // }
+                // if (!MonitorApp.settings.get_boolean ("indicator-network-upload-state")) {
+                // MonitorApp.settings.set_boolean ("indicator-network-upload-state", false);
+                // }
+                // if (!MonitorApp.settings.get_boolean ("indicator-network-download-state")) {
+                // MonitorApp.settings.set_boolean ("indicator-network-download-state", false);
+                // }
 
                 window.hide ();
                 MonitorApp.settings.set_boolean ("background-state", true);
@@ -101,6 +101,13 @@ namespace Monitor {
             print (" Monitor %s \n", VCS_TAG);
             print ("\n");
 
+            print (
+                "LibPCI ver: %d.%d.%d \n",
+                PCIUtils.LIBPCI_MAJOR_VER,
+                PCIUtils.LIBPCI_MINOR_VER,
+                PCIUtils.LIBPCI_PATCH_VER
+                );
+
             // add command line options
             try {
                 var opt_context = new OptionContext ("");

src/PCIUtils.vala

@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ */
+
+namespace Monitor.PCIUtils {
+    const int LIBPCI_MAJOR_VER = (Pci.LIB_VERSION & 0xFF0000) >> 16;
+    const int LIBPCI_MINOR_VER = (Pci.LIB_VERSION & 0x00FF00) >> 8;
+    const int LIBPCI_PATCH_VER = (Pci.LIB_VERSION & 0x0000FF) >> 0;
+}

src/Resources/GPU/GPUAmd.vala

@@ -4,12 +4,13 @@
  */
 
 public class Monitor.GPUAmd : IGPU, Object {
-    public SessionManager ? session_manager { get; protected set; }
 
     public Gee.HashMap<string, HwmonTemperature> hwmon_temperatures { get; set; }
 
     public string hwmon_module_name { get; set; }
 
+    public string name { get; set; }
+
     public int percentage { get; protected set; }
 
     public int memory_percentage { get; protected set; }
@@ -20,53 +21,33 @@ public class Monitor.GPUAmd : IGPU, Object {
 
     public double temperature { get; protected set; }
 
-    private string path { get; set; }
-
-    construct {
-        // session_manager = get_sessman ();
-        // When path for GPU is created it can be assigned to card0 or card1
-        // this a bit random. This should be removed when multiple GPU
-        // support will be added.
-        try {
-            var dir = Dir.open ("/sys/class/drm/");
-            string ? name;
-            while ((name = dir.read_name ()) != null) {
-                if (name == "card0") {
-                    path = "/sys/class/drm/card0/";
-                    debug ("GPU path: %s", path);
-
-                } else if (name == "card1") {
-                    path = "/sys/class/drm/card1/";
-                    debug ("GPU path: %s", path);
-
-                }
-            }
-            if (path == null) {
-                debug ("Can't detect right path for AMD GPU");
-            }
-        } catch (Error e) {
-            print ("Error: %s\n", e.message);
-        }
+    protected string sysfs_path { get; set; }
+
+    public GPUAmd (Pci.Access pci_access, Pci.Dev pci_device) {
+        name = pci_parse_name (pci_access, pci_device);
+        name = "AMD® " + name;
+
+        sysfs_path = pci_parse_sysfs_path (pci_access, pci_device);
     }
 
     private void update_temperature () {
         temperature = double.parse (hwmon_temperatures.get ("edge").input) / 1000;
     }
 
     private void update_memory_vram_used () {
-        memory_vram_used = double.parse (get_sysfs_value (path + "device/mem_info_vram_used"));
+        memory_vram_used = double.parse (get_sysfs_value (sysfs_path + "/mem_info_vram_used"));
     }
 
     private void update_memory_vram_total () {
-        memory_vram_total = double.parse (get_sysfs_value (path + "device/mem_info_vram_total"));
+        memory_vram_total = double.parse (get_sysfs_value (sysfs_path + "/mem_info_vram_total"));
     }
 
     private void update_memory_percentage () {
         memory_percentage = (int) (Math.round ((memory_vram_used / memory_vram_total) * 100));
     }
 
     private void update_percentage () {
-        percentage = int.parse (get_sysfs_value (path + "device/gpu_busy_percent"));
+        percentage = int.parse (get_sysfs_value (sysfs_path + "/gpu_busy_percent"));
     }
 
     public void update () {

src/Resources/GPU/GPUIntel.vala

@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ */
+
+public class Monitor.GPUIntel : IGPU, Object {
+
+    public Gee.HashMap<string, HwmonTemperature> hwmon_temperatures { get; set; }
+
+    public string hwmon_module_name { get; set; }
+
+    public string name { get; set; }
+
+    public int percentage { get; protected set; }
+
+    public int memory_percentage { get; protected set; }
+
+    public double memory_vram_used { get; protected set; }
+
+    public double memory_vram_total { get; set; }
+
+    public double temperature { get; protected set; }
+
+    protected string sysfs_path { get; set; }
+
+    public GPUIntel (Pci.Access pci_access, Pci.Dev pci_device) {
+        name = pci_parse_name (pci_access, pci_device);
+        name = "Intel® " + name;
+
+        sysfs_path = pci_parse_sysfs_path (pci_access, pci_device);
+    }
+
+    private void update_temperature () {
+        // @TODO: Intel GPU temperature retrieval needs implementation.
+        temperature = 0;
+    }
+
+    private void update_memory_vram_used () {
+        // @TODO: Intel GPU used VRAM retrieval needs implementation.
+        memory_vram_used = 0;
+    }
+
+    private void update_memory_vram_total () {
+        // @TODO: Intel GPU total VRAM retrieval needs implementation.
+        memory_vram_total = 0;
+    }
+
+    private void update_memory_percentage () {
+        // @TODO: Intel GPU memory percentage needs implementation.
+        memory_percentage = 0;
+    }
+
+    private void update_percentage () {
+        // @TODO: Intel GPU usage percentage needs implementation.
+        percentage = 0;
+    }
+
+    public void update () {
+        update_temperature ();
+        update_memory_vram_used ();
+        update_memory_vram_total ();
+        update_memory_percentage ();
+        update_percentage ();
+    }
+
+}

src/Resources/GPU/GPUNvidia.vala

@@ -4,12 +4,13 @@
  */
 
 public class Monitor.GPUNvidia : IGPU, Object {
-    public SessionManager ? session_manager { get; protected set; }
 
     public Gee.HashMap<string, HwmonTemperature> hwmon_temperatures { get; set; }
 
     public string hwmon_module_name { get; set; }
 
+    public string name { get; set; }
+
     public int percentage { get; protected set; }
 
     public int memory_percentage { get; protected set; }
@@ -22,6 +23,8 @@ public class Monitor.GPUNvidia : IGPU, Object {
 
     public double temperature { get; protected set; }
 
+    protected string sysfs_path { get; set; }
+
     public int nvidia_temperature = 0;
 
     public int nvidia_memory_vram_used = 0;
@@ -46,8 +49,14 @@ public class Monitor.GPUNvidia : IGPU, Object {
 
     public X.Display nvidia_display;
 
+    public GPUNvidia (Pci.Access pci_access, Pci.Dev pci_device) {
+        name = pci_parse_name (pci_access, pci_device);
+        name = "nVidia® " + name;
+
+        sysfs_path = pci_parse_sysfs_path (pci_access, pci_device);
+    }
+
     construct {
-        // session_manager = get_sessman ();
         nvidia_display = new X.Display ();
     }
 

src/Resources/GPU/IGPU.vala

@@ -4,17 +4,12 @@
  */
 
 public interface Monitor.IGPU : Object {
-    public abstract SessionManager ? session_manager { get; public set; }
 
     public abstract Gee.HashMap<string, HwmonTemperature> hwmon_temperatures { get; set; }
 
     public abstract string hwmon_module_name { get; protected set; }
 
-    public string name {
-        owned get {
-            return session_manager.renderer.split ("(", 2)[0];
-        }
-    }
+    public abstract string name { get; protected set; }
 
     public abstract int percentage { get; protected set; }
 
@@ -26,6 +21,8 @@ public interface Monitor.IGPU : Object {
 
     public abstract double temperature { get; protected set; }
 
+    protected abstract string sysfs_path { get; protected set; }
+
     public abstract void update_temperature ();
 
     public abstract void update_memory_vram_used ();
@@ -38,6 +35,19 @@ public interface Monitor.IGPU : Object {
 
     public abstract void update ();
 
+    protected virtual string pci_parse_name (Pci.Access pci_access, Pci.Dev pci_device) {
+        char namebuf[256];
+        return pci_access.lookup_name (namebuf, Pci.LookupMode.DEVICE, pci_device.vendor_id, pci_device.device_id);
+    }
+
+    protected virtual string pci_parse_sysfs_path (Pci.Access pci_access, Pci.Dev pci_device) {
+        string pci_path_domain_bus = "%04x:%02x".printf (pci_device.domain_16, pci_device.bus);
+        string pci_path_dev_func = "%02x.%d".printf (pci_device.dev, pci_device.func);
+        string path = "/sys/class/pci_bus/%s/device/%s:%s".printf (pci_path_domain_bus, pci_path_domain_bus, pci_path_dev_func);
+        debug ("GPU path: %s", path);
+
+        return path;
+    }
 
     public virtual string get_sysfs_value (string path) {
         string content;