Use provider to get pids

elementary · Dec 11, 2023 · d673254 · d673254
1 parent bb35702
commit d673254
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 37 deletions.
diff --git a/src/Managers/Process.vala b/src/Managers/Process.vala
@@ -135,7 +135,7 @@ public class Monitor.Process : GLib.Object {
     }
 
     private bool get_children_pids () {
-        string ? children_content = ProcessUtils.read_file ("/tmp/fakeproc/proc/%d/task/%d/children".printf (stat.pid, stat.pid));
+        string ? children_content = ProcessUtils.read_file ("/proc/%d/task/%d/children".printf (stat.pid, stat.pid));
         if (children_content == "" || children_content == null) {
             return false;
         }
@@ -201,7 +201,7 @@ public class Monitor.Process : GLib.Object {
 
     // Reads the /proc/%pid%/stat file and updates the process with the information therein.
     private bool parse_stat () {
-        string ? stat_contents = ProcessUtils.read_file ("/tmp/fakeproc/proc/%d/stat".printf (stat.pid));
+        string ? stat_contents = ProcessUtils.read_file ("/proc/%d/stat".printf (stat.pid));
 
         if (stat_contents == null) {
             return false;
@@ -282,7 +282,7 @@ public class Monitor.Process : GLib.Object {
      * Reads the /proc/%pid%/cmdline file and updates from the information contained therein.
      */
     private bool read_cmdline () {
-        string ? cmdline = ProcessUtils.read_file ("/tmp/fakeproc/proc/%d/cmdline".printf (stat.pid));
+        string ? cmdline = ProcessUtils.read_file ("/proc/%d/cmdline".printf (stat.pid));
 
         if (cmdline == null) {
             return false;

diff --git a/src/Managers/ProcessFlatpak.vala b/src/Managers/ProcessFlatpak.vala
diff --git a/src/Managers/ProcessManager.vala b/src/Managers/ProcessManager.vala
@@ -130,14 +130,10 @@ namespace Monitor {
                 remove_process (pid);
             }
 
-            var uid = Posix.getuid ();
-            GTop.ProcList proclist;
-            // var pids = GTop.get_proclist (out proclist, GTop.GLIBTOP_KERN_PROC_UID, uid);
-            var pids = GTop.get_proclist (out proclist, GTop.GLIBTOP_KERN_PROC_ALL, uid);
-
-            for (int i = 0; i < proclist.number; i++) {
-                int pid = pids[i];
+            var process_provider = ProcessProvider.get_default ();
+            var pids = process_provider.get_pids ();
 
+            foreach (int pid in pids) {
                 if (!process_list.has_key (pid) && !kernel_process_blacklist.contains (pid)) {
                     add_process (pid);
                 }

diff --git a/src/Managers/ProcessProvider.vala b/src/Managers/ProcessProvider.vala
@@ -24,8 +24,9 @@ namespace Monitor {
             // }
             GTop.ProcList proclist;
             // var pids = GTop.get_proclist (out proclist, GTop.GLIBTOP_KERN_PROC_UID, uid);
-            int[] pids = GTop.get_proclist (out proclist, GTop.GLIBTOP_KERN_PROC_ALL, Posix.getuid ());
-            debug("%d", pids.length);
+            var pids = GTop.get_proclist (out proclist, GTop.GLIBTOP_KERN_PROC_ALL, Posix.getuid ());
+            pids.length = (int) proclist.number;
+
             return pids;
         }
 

diff --git a/src/meson.build b/src/meson.build
@@ -52,7 +52,6 @@ source_app_files = [
     # 'Managers/AppManager.vala',
     'Managers/ProcessManager.vala',
     'Managers/Process.vala',
-    'Managers/ProcessFlatpak.vala',
     'Managers/ProcessStructs.vala',
     'Managers/ProcessUtils.vala',
     'Managers/HttpClientAsync.vala',

diff --git a/subprojects/stylesheet b/subprojects/stylesheet