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

Android: Make ports const and hide them in cpp

Browse Source 
Change-Id: I9ab41e9fea2e80a8ff78000687f700ed079440b7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-08-07 11:38:43 +02:00
parent b02a708a5f
commit ed577701dd
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,9 @@ static const QRegularExpression userIdPattern("u(\\d+)_a");
static const std::chrono::milliseconds s_jdbTimeout = 5s; static const std::chrono::milliseconds s_jdbTimeout = 5s;
static const Port s_localJdbServerPort(5038);
static const Port s_localDebugServerPort(5039); // Local end of forwarded debug socket.
static qint64 extractPID(const QString &output, const QString &packageName) static qint64 extractPID(const QString &output, const QString &packageName)
{ {
qint64 pid = -1; qint64 pid = -1;
@@ -123,7 +126,6 @@ static FilePath debugServer(bool useLldb, const Target *target)
if (path.exists()) if (path.exists())
return path; return path;
} }
return {}; return {};
} }
@@ -144,8 +146,6 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner)
m_qmlDebugServices = QmlDebug::QmlPreviewServices; m_qmlDebugServices = QmlDebug::QmlPreviewServices;
else else
m_qmlDebugServices = QmlDebug::NoQmlDebugServices; m_qmlDebugServices = QmlDebug::NoQmlDebugServices;
m_localDebugServerPort = Utils::Port(5039);
QTC_CHECK(m_localDebugServerPort.isValid());
if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) { if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) {
qCDebug(androidRunWorkerLog) << "QML debugging enabled"; qCDebug(androidRunWorkerLog) << "QML debugging enabled";
QTcpServer server; QTcpServer server;
@@ -157,8 +157,6 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner)
m_qmlServer.setPort(server.serverPort()); m_qmlServer.setPort(server.serverPort());
qCDebug(androidRunWorkerLog) << "QML server:" << m_qmlServer.toDisplayString(); qCDebug(androidRunWorkerLog) << "QML server:" << m_qmlServer.toDisplayString();
} }
m_localJdbServerPort = Utils::Port(5038);
QTC_CHECK(m_localJdbServerPort.isValid());
auto target = runControl->target(); auto target = runControl->target();
m_packageName = AndroidManager::packageName(target); m_packageName = AndroidManager::packageName(target);
@@ -516,7 +514,7 @@ void AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
lldbServerArgs << debugServerFile lldbServerArgs << debugServerFile
<< "platform" << "platform"
// << "--server" // Can lead to zombie servers // << "--server" // Can lead to zombie servers
<< "--listen" << QString("*:%1").arg(m_localDebugServerPort.toString()); << "--listen" << QString("*:%1").arg(s_localDebugServerPort.toString());
m_debugServerProcess.reset(AndroidManager::startAdbProcess(lldbServerArgs, &lldbServerErr)); m_debugServerProcess.reset(AndroidManager::startAdbProcess(lldbServerArgs, &lldbServerErr));
if (!m_debugServerProcess) { if (!m_debugServerProcess) {
@@ -546,7 +544,7 @@ void AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
qCDebug(androidRunWorkerLog) << "Debugger process started"; qCDebug(androidRunWorkerLog) << "Debugger process started";
m_debugServerProcess->setObjectName("AndroidDebugServerProcess"); m_debugServerProcess->setObjectName("AndroidDebugServerProcess");
removeForwardPort("tcp:" + m_localDebugServerPort.toString(), removeForwardPort("tcp:" + s_localDebugServerPort.toString(),
"localfilesystem:" + gdbServerSocket, "C++"); "localfilesystem:" + gdbServerSocket, "C++");
} }
} }
@@ -748,7 +746,7 @@ void AndroidRunnerWorker::asyncStop()
void AndroidRunnerWorker::handleJdbWaiting() void AndroidRunnerWorker::handleJdbWaiting()
{ {
if (!removeForwardPort("tcp:" + m_localJdbServerPort.toString(), if (!removeForwardPort("tcp:" + s_localJdbServerPort.toString(),
"jdwp:" + QString::number(m_processPID), "JDB")) "jdwp:" + QString::number(m_processPID), "JDB"))
return; return;
@@ -757,7 +755,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
QStringList jdbArgs("-connect"); QStringList jdbArgs("-connect");
jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1") jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1")
.arg(m_localJdbServerPort.toString()); .arg(s_localJdbServerPort.toString());
qCDebug(androidRunWorkerLog).noquote() qCDebug(androidRunWorkerLog).noquote()
<< "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput(); << "Starting JDB:" << CommandLine(jdbPath, jdbArgs).toUserOutput();
m_jdbProcess.reset(new Process); m_jdbProcess.reset(new Process);
@@ -848,7 +846,7 @@ void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)
startNativeDebugging(); startNativeDebugging();
// In debugging cases this will be funneled to the engine to actually start // In debugging cases this will be funneled to the engine to actually start
// and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below. // and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below.
emit remoteProcessStarted(m_localDebugServerPort, m_qmlServer, m_processPID); emit remoteProcessStarted(s_localDebugServerPort, m_qmlServer, m_processPID);
logcatReadStandardOutput(); logcatReadStandardOutput();
QTC_ASSERT(!m_psIsAlive, /**/); QTC_ASSERT(!m_psIsAlive, /**/);
QStringList isAliveArgs = selector() << "shell" << pidPollingScript.arg(m_processPID); QStringList isAliveArgs = selector() << "shell" << pidPollingScript.arg(m_processPID);

2
src/plugins/android/androidrunnerworker.h
View File

@@ -86,10 +86,8 @@ private:
bool m_useCppDebugger = false; bool m_useCppDebugger = false;
bool m_useLldb = false; // FIXME: Un-implemented currently. bool m_useLldb = false; // FIXME: Un-implemented currently.
QmlDebug::QmlDebugServicesPreset m_qmlDebugServices; QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
Utils::Port m_localDebugServerPort; // Local end of forwarded debug socket.
QUrl m_qmlServer; QUrl m_qmlServer;
JDBState m_jdbState = JDBState::Idle; JDBState m_jdbState = JDBState::Idle;
Utils::Port m_localJdbServerPort;
std::unique_ptr<Utils::Process> m_debugServerProcess; // gdbserver or lldb-server std::unique_ptr<Utils::Process> m_debugServerProcess; // gdbserver or lldb-server
std::unique_ptr<Utils::Process> m_jdbProcess; std::unique_ptr<Utils::Process> m_jdbProcess;
QString m_deviceSerialNumber; QString m_deviceSerialNumber;