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

Debugger: Interrupt inferior via signal operation on Windows.

Browse Source 
Task-number: QTCREATORBUG-10558

Change-Id: I5a27beca4601cae3b0de8f903a2cbc08ee801149
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
David Schulz
2013-11-04 09:47:34 +01:00
committed by hjk
parent 9a4caa4b4c
commit 94c10ae6cc
9 changed files with 87 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1172,10 +1172,7 @@ void CdbEngine::interruptInferior()
notifyInferiorRunOk();
return;
}
if (!doInterruptInferior(NoSpecialStop)) {
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorStopFailed")
notifyInferiorStopFailed();
}
doInterruptInferior(NoSpecialStop);
}
void CdbEngine::doInterruptInferiorCustomSpecialStop(const QVariant &v)
@@ -1185,21 +1182,32 @@ void CdbEngine::doInterruptInferiorCustomSpecialStop(const QVariant &v)
m_customSpecialStopData.push_back(v);
}
bool CdbEngine::doInterruptInferior(SpecialStopMode sm)
void CdbEngine::handleDoInterruptInferior(const QString &errorMessage)
{
const SpecialStopMode oldSpecialMode = m_specialStopMode;
m_specialStopMode = sm;
showMessage(QString::fromLatin1("Interrupting process %1...").arg(inferiorPid()), LogMisc);
QString errorMessage;
const bool ok = interruptProcess(inferiorPid(), CdbEngineType,
&errorMessage, m_cdbIs64Bit);
if (!ok) {
m_specialStopMode = oldSpecialMode;
if (errorMessage.isEmpty()) {
showMessage(QLatin1String("Interrupted ") + QString::number(inferiorPid()));
} else {
showMessage(errorMessage, LogError);
notifyInferiorStopFailed();
}
return ok;
m_signalOperation->disconnect(this);
m_signalOperation.clear();
}
void CdbEngine::doInterruptInferior(SpecialStopMode sm)
{
showMessage(QString::fromLatin1("Interrupting process %1...").arg(inferiorPid()), LogMisc);
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed(); return;);
QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed(); return;);
m_signalOperation = startParameters().device->signalOperation();
m_specialStopMode = sm;
QTC_ASSERT(m_signalOperation, notifyInferiorStopFailed(); return;);
connect(m_signalOperation.data(), SIGNAL(finished(QString)),
SLOT(handleDoInterruptInferior(QString)));
m_signalOperation->setDebuggerCommand(startParameters().debuggerCommand);
m_signalOperation->interruptProcess(inferiorPid());
}
void CdbEngine::executeRunToLine(const ContextData &data)