1 files changed, 60 insertions, 5 deletions

diff --git a/compat/process-list.hpp b/compat/process-list.hpp
index 10613791..39e12603 100644
--- a/compat/process-list.hpp
+++ b/compat/process-list.hpp
@@ -52,7 +52,7 @@ static QStringList get_all_executable_names()
 template<typename = void>
 static QStringList get_all_executable_names()
 {
-    QStringList ret;
+    QStringList ret; ret.reserve(2048);
     std::vector<int> vec;
 
     while (true)
@@ -103,7 +103,7 @@ static QStringList get_all_executable_names()
                     if (idx != -1)
                     {
                         QString tmp = cmdline[0].mid(idx+1);
-                        if (cmdline.size() > 1 && (tmp == "wine.bin" || tmp == "wine"))
+                        if (cmdline.size() > 1 && (tmp == QStringLiteral("wine.bin") || tmp == QStringLiteral("wine")))
                         {
                             idx = cmdline[1].lastIndexOf('/');
                             if (idx == -1)
@@ -129,14 +129,68 @@ static QStringList get_all_executable_names()
     }
 }
 
-#elif defined __linux
+#elif defined __linux__
+
+#include <cerrno>
+
+#ifdef OTR_HAS_LIBPROC2
+#include <libproc2/pids.h>
+template<typename = void>
+QStringList get_all_executable_names()
+{
+    QStringList ret; ret.reserve(2048);
+    enum pids_item items[] = { PIDS_ID_PID, PIDS_CMD, PIDS_CMDLINE_V };
+
+    enum rel_items { rel_pid, rel_cmd, rel_cmdline };
+    struct pids_info *info = NULL;
+    struct pids_stack *stack;
+    QString tmp; tmp.reserve(255);
+
+    procps_pids_new(&info, items, 3);
 
+    // procps-ng version 4.0.5 removed an unused argument in PIDS_VAL() macro.
+    // cf. https://gitlab.com/procps-ng/procps/-/commit/967fdcfb06e20aad0f3
+
+    // Although the emitted machine code is identical, backward API
+    // compatibility was silently broken in the patch with no upgrade path
+    // (e.g. deprecating PIDS_VAL() while introducing PIDS_VAL2()).
+
+    // Unfortunately, procps-ng doesn't include a #define for identifying its
+    // version.  For these reasons the code below depends on undocumented ABI
+    // compatibility between procps-ng versions.. -sh 20241226
+
+#define OPENTRACK_PIDS_VAL(i, type, stack) stack->head[i].result.type
+
+    while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY)))
+    {
+        char **p_cmdline = OPENTRACK_PIDS_VAL(rel_cmdline, strv, stack);
+
+        // note, wine sets argv[0] so no parsing like in OSX case
+        if (p_cmdline && p_cmdline[0] && p_cmdline[0][0] &&
+            !(p_cmdline[0][0] == '-' && !p_cmdline[0][1]))
+        {
+            tmp = QString{p_cmdline[0]};
+            const int idx = std::max(tmp.lastIndexOf('\\'), tmp.lastIndexOf('/'));
+            if (idx != -1)
+                tmp = tmp.mid(idx+1);
+            //qDebug() << "procps" << tmp;
+            ret.append(tmp);
+        }
+    }
+    //qDebug() << "-- procps end";
+
+    procps_pids_unref(&info);
+
+    return ret;
+}
+#else
 #include <proc/readproc.h>
 #include <cerrno>
+
 template<typename = void>
-static QStringList get_all_executable_names()
+QStringList get_all_executable_names()
 {
-    QStringList ret;
+    QStringList ret; ret.reserve(2048);
     proc_t** procs = readproctab(PROC_FILLCOM);
     if (procs == nullptr)
     {
@@ -159,6 +213,7 @@ static QStringList get_all_executable_names()
     free(procs);
     return ret;
 }
+#endif
 
 #else
 template<typename = void>