feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProcessInfo: Don't use QtcProcess::readDataFromProcess()

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-07-05 17:40:50 +02:00
parent 5be5f7a331
commit 37ac00e498
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/utils/processinfo.cpp
View File

@@ -119,24 +119,20 @@ static QList<ProcessInfo> getLocalProcessesUsingProc()
// Determine UNIX processes by running ps // Determine UNIX processes by running ps
static QMap<qint64, QString> getLocalProcessDataUsingPs(const QString &column) 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; QMap<qint64, QString> result;
Utils::QtcProcess psProcess; for (int i = 1; i < lines.size(); ++i) { // Skip header
psProcess.setCommand({"ps", {"-e", "-o", "pid," + column}}); const QString line = lines.at(i).trimmed();
psProcess.start(); const int pidSep = line.indexOf(QChar::Space);
if (psProcess.waitForStarted()) { const qint64 pid = line.left(pidSep).toLongLong();
QByteArray output; result.insert(pid, line.mid(pidSep + 1));
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);
}
}
} }
return result; return result;
} }