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

Debugger: remove can interrupt check

Browse Source 
We are now able to interrupt via Ctrl+C so we do not necessarily need a
local inferior with a pid.

Change-Id: I31997c5d2885b748699756908ef46686798ccafa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-10-12 10:42:22 +02:00
parent 1fa3255242
commit 767644967c
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -611,9 +611,6 @@ void CdbEngine::shutdownInferior()
if (commandsPending()) { if (commandsPending()) {
showMessage("Cannot shut down inferior due to pending commands.", LogWarning); showMessage("Cannot shut down inferior due to pending commands.", LogWarning);
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownFinished") STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownFinished")
} else if (!canInterruptInferior()) {
showMessage("Cannot interrupt the inferior.", LogWarning);
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownFinished")
} else { } else {
interruptInferior(); // Calls us again interruptInferior(); // Calls us again
return; return;
@@ -758,11 +755,6 @@ void CdbEngine::doContinueInferior()
runCommand({"g", NoFlags}); runCommand({"g", NoFlags});
} }
bool CdbEngine::canInterruptInferior() const
{
return m_effectiveStartMode != AttachToRemoteServer && inferiorPid();
}
void CdbEngine::interruptInferior() void CdbEngine::interruptInferior()
{ {
if (debug) if (debug)

1
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -129,7 +129,6 @@ private:
void doContinueInferior(); void doContinueInferior();
void parseOutputLine(QString line); void parseOutputLine(QString line);
bool isCdbProcessRunning() const { return m_process.state() != QProcess::NotRunning; } bool isCdbProcessRunning() const { return m_process.state() != QProcess::NotRunning; }
bool canInterruptInferior() const;
inline void postDisassemblerCommand(quint64 address, DisassemblerAgent *agent); inline void postDisassemblerCommand(quint64 address, DisassemblerAgent *agent);
void postDisassemblerCommand(quint64 address, quint64 endAddress, void postDisassemblerCommand(quint64 address, quint64 endAddress,
DisassemblerAgent *agent); DisassemblerAgent *agent);