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

Android: Simplify handleJdbSettled()

Browse Source 
There is no need to wait for m_jdbProcess output, parse it just to
detect the '>' prompt and write only one command afterwards.
Write all 4 commands at once. They should be buffered on process side
and executed sequentially anyway. Since the last command is "exit",
wait for process finished after all commands have been written.
No need to parse the output now.

Change-Id: Iaa5eb967f56097cc24215698151658e9804c9e13
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-19 16:24:09 +02:00
parent f1c7e42aa3
commit 2b2256b1c9
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/android/androidrunnerworker.cpp
View File

@@ -52,7 +52,7 @@ namespace Android::Internal {
static const QString pidPollingScript = QStringLiteral("while [ -d /proc/%1 ]; do sleep 1; done");
static const QRegularExpression userIdPattern("u(\\d+)_a");
static const std::chrono::milliseconds s_jdbTimeout = 5s;
static const std::chrono::milliseconds s_jdbTimeout = 60s;
static const Port s_localJdbServerPort(5038);
static const Port s_localDebugServerPort(5039); // Local end of forwarded debug socket.
@@ -763,37 +763,19 @@ void AndroidRunnerWorker::handleJdbWaiting()
void AndroidRunnerWorker::handleJdbSettled()
{
qCDebug(androidRunWorkerLog) << "Handle JDB settled";
auto waitForCommand = [this] {
for (int i = 0; i < 120 && m_jdbProcess->state() == QProcess::Running; ++i) {
m_jdbProcess->waitForReadyRead(500ms);
const QByteArray lines = m_jdbProcess->readAllRawStandardOutput();
qCDebug(androidRunWorkerLog) << "JDB output:" << lines;
const auto linesList = lines.split('\n');
for (const auto &line : linesList) {
auto msg = line.trimmed();
if (msg.startsWith(">"))
return true;
}
}
return false;
};
const QStringList commands{"ignore uncaught java.lang.Throwable", "threads", "cont", "exit"};
for (const QString &command : commands) {
if (waitForCommand()) {
qCDebug(androidRunWorkerLog) << "JDB input:" << command;
m_jdbProcess->write(QString("%1\n").arg(command));
}
}
m_jdbProcess->write("ignore uncaught java.lang.Throwable\n"
"threads\n"
"cont\n"
"exit\n");
if (!m_jdbProcess->waitForFinished(s_jdbTimeout)) {
qCDebug(androidRunWorkerLog) << qPrintable(m_jdbProcess->allOutput());
qCCritical(androidRunWorkerLog) << "Terminating JDB due to timeout";
m_jdbProcess.reset();
} else if (m_jdbProcess->exitStatus() == QProcess::NormalExit && m_jdbProcess->exitCode() == 0) {
qCDebug(androidRunWorkerLog) << qPrintable(m_jdbProcess->allOutput());
qCDebug(androidRunWorkerLog) << "JDB settled";
return;
}
emit remoteProcessFinished(Tr::tr("Cannot attach JDB to the running application."));
}