From 37ac00e4981523df194e8638690239173eaf92d0 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 5 Jul 2022 17:40:50 +0200
Subject: [PATCH] ProcessInfo: Don't use QtcProcess::readDataFromProcess()

There is no big benefit of calling readDataFromProcess()
when the last argument is false. Simplify
getLocalProcessDataUsingPs() method.

Change-Id: I3839f93574945ef2bb6d147415cffc61d95afda0
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/processinfo.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp
index 8508e85197b..c23f9292277 100644
--- a/src/libs/utils/processinfo.cpp
+++ b/src/libs/utils/processinfo.cpp
@@ -119,24 +119,20 @@ static QList<ProcessInfo> getLocalProcessesUsingProc()
 // Determine UNIX processes by running ps
 static QMap<qint64, QString> getLocalProcessDataUsingPs(const QString &column)
 {
+    QtcProcess process;
+    process.setCommand({"ps", {"-e", "-o", "pid," + column}});
+    process.start();
+    if (!process.waitForFinished())
+        return {};
+
+    // Split "457 /Users/foo.app arg1 arg2"
+    const QStringList lines = process.stdOut().split(QLatin1Char('\n'));
     QMap<qint64, QString> result;
-    Utils::QtcProcess psProcess;
-    psProcess.setCommand({"ps", {"-e", "-o", "pid," + column}});
-    psProcess.start();
-    if (psProcess.waitForStarted()) {
-        QByteArray output;
-        if (psProcess.readDataFromProcess(30, &output, nullptr, false)) {
-            // Split "457 /Users/foo.app arg1 arg2"
-            const QStringList lines = QString::fromLocal8Bit(output).split(QLatin1Char('\n'));
-            const int lineCount = lines.size();
-            const QChar blank = QLatin1Char(' ');
-            for (int l = 1; l < lineCount; l++) { // Skip header
-                const QString line = lines.at(l).trimmed();
-                const int pidSep = line.indexOf(blank);
-                const qint64 pid = line.left(pidSep).toLongLong();
-                result[pid] = line.mid(pidSep + 1);
-            }
-        }
+    for (int i = 1; i < lines.size(); ++i) { // Skip header
+        const QString line = lines.at(i).trimmed();
+        const int pidSep = line.indexOf(QChar::Space);
+        const qint64 pid = line.left(pidSep).toLongLong();
+        result.insert(pid, line.mid(pidSep + 1));
     }
     return result;
 }