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

debbugger: try to disconnect from TRK on application shutdown

Browse Source
This commit is contained in:
hjk
2009-09-28 16:08:28 +02:00
parent ef37f7f1e5
commit 4d1bae47c1
1 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1583,35 +1583,6 @@ void TrkGdbAdapter::handleRfcommStateChanged(QProcess::ProcessState newState)
// AbstractGdbAdapter interface implementation // AbstractGdbAdapter interface implementation
// //
/*
void TrkGdbAdapter::kill()
{
if (m_options->mode == TrkOptions::BlueTooth
&& m_rfcommProc.state() == QProcess::Running)
m_rfcommProc.kill();
m_gdbProc.kill();
}
void TrkGdbAdapter::terminate()
{
m_rfcommProc.terminate();
m_gdbProc.terminate();
}
bool TrkGdbAdapter::waitForFinished(int msecs)
{
QByteArray ba;
ba.append(0x03);
m_rfcommProc.write(ba);
m_rfcommProc.terminate();
m_rfcommProc.waitForFinished();
QProcess proc;
proc.start("rfcomm release " + m_options->blueToothDevice);
proc.waitForFinished();
return m_gdbProc.waitForFinished(msecs);
}
*/
QByteArray TrkGdbAdapter::readAllStandardError() QByteArray TrkGdbAdapter::readAllStandardError()
{ {
return m_gdbProc.readAllStandardError(); return m_gdbProc.readAllStandardError();
@@ -1659,16 +1630,35 @@ void TrkGdbAdapter::shutdown()
case InferiorRunningRequested: case InferiorRunningRequested:
case InferiorRunning: case InferiorRunning:
setState(InferiorShuttingDown); setState(InferiorShuttingDown);
qDebug() << "kill";
m_engine->postCommand(_("kill"), CB(handleKill)); m_engine->postCommand(_("kill"), CB(handleKill));
return; return;
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
qDebug() << "gdb-exit"; sendTrkMessage(0x02, TrkCB(handleDisconnect));
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), CB(handleExit));
return; return;
/*
if (m_options->mode == TrkOptions::BlueTooth
&& m_rfcommProc.state() == QProcess::Running)
m_rfcommProc.kill();
m_rfcommProc.terminate();
m_rfcommProc.write(ba);
m_rfcommProc.terminate();
m_rfcommProc.waitForFinished();
m_gdbProc.kill();
m_gdbProc.terminate();
QByteArray ba;
ba.append(0x03);
QProcess proc;
proc.start("rfcomm release " + m_options->blueToothDevice);
proc.waitForFinished();
m_gdbProc.waitForFinished(msecs);
*/
default: default:
QTC_ASSERT(false, qDebug() << state()); QTC_ASSERT(false, qDebug() << state());
} }