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

debugger: move script engine initialization to startDebugger()

Browse Source
This commit is contained in:
hjk
2009-09-02 10:07:38 +02:00
parent f74d252b95
commit a48a686a1d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/script/scriptengine.cpp
View File

@@ -188,10 +188,9 @@ ScriptEngine::ScriptEngine(DebuggerManager *parent)
{ {
q = parent; q = parent;
qq = parent->engineInterface(); qq = parent->engineInterface();
m_scriptEngine = new QScriptEngine(this); // created in startDebugger()
m_scriptAgent = new ScriptAgent(this, m_scriptEngine); m_scriptEngine = 0;
m_scriptEngine->setAgent(m_scriptAgent); m_scriptAgent = 0;
m_scriptEngine->setProcessEventsInterval(1 /*ms*/);
} }
ScriptEngine::~ScriptEngine() ScriptEngine::~ScriptEngine()
@@ -220,6 +219,13 @@ void ScriptEngine::exitDebugger()
bool ScriptEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp) bool ScriptEngine::startDebugger(const QSharedPointer<DebuggerStartParameters> &sp)
{ {
if (!m_scriptEngine)
m_scriptEngine = new QScriptEngine(this);
if (!m_scriptAgent)
m_scriptAgent = new ScriptAgent(this, m_scriptEngine);
m_scriptEngine->setAgent(m_scriptAgent);
m_scriptEngine->setProcessEventsInterval(1 /*ms*/);
m_stopped = false; m_stopped = false;
m_stopOnNextLine = false; m_stopOnNextLine = false;
m_scriptEngine->abortEvaluation(); m_scriptEngine->abortEvaluation();

12
tests/manual/trk/runner.cpp
View File

@@ -109,9 +109,9 @@ Runner::Runner()
m_gdbServerIP = "127.0.0.1"; m_gdbServerIP = "127.0.0.1";
m_gdbServerPort = QString::number(2222 + userId); m_gdbServerPort = QString::number(2222 + userId);
m_trkServerProc.setObjectName("TRKSERVER"); m_trkServerProc.setObjectName("TRKSERVER PROCESS");
m_adapterProc.setObjectName("ADAPTER"); m_adapterProc.setObjectName("ADAPTER PROCESS");
m_debuggerProc.setObjectName("GDB"); m_debuggerProc.setObjectName("GDB PROCESS");
connectProcess(&m_trkServerProc); connectProcess(&m_trkServerProc);
connectProcess(&m_adapterProc); connectProcess(&m_adapterProc);
@@ -319,13 +319,13 @@ void Runner::writeGdbInit()
void Runner::run() void Runner::run()
{ {
launchAdapter();
if (m_isUnix) { if (m_isUnix) {
QProcess::execute("killall -s USR adapter trkserver"); QProcess::execute("killall -s USR adapter trkserver");
QProcess::execute("killall adapter trkserver"); QProcess::execute("killall adapter trkserver");
} }
launchAdapter();
uid_t userId = getuid(); uid_t userId = getuid();
if (m_trkServerName.isEmpty()) if (m_trkServerName.isEmpty())
m_trkServerName = QString("TRKSERVER-%1").arg(userId); m_trkServerName = QString("TRKSERVER-%1").arg(userId);
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
#if 1 #if 1
QStringList args = QCoreApplication::arguments(); QStringList args = QCoreApplication::arguments();
qDebug() << "ARGS: " << args; qDebug() << "RUNNER ARGS: " << args;
#else #else
// Important options: -w wait for adapter, -af omit serial frame. // Important options: -w wait for adapter, -af omit serial frame.
QStringList args = QStringList() << "-w" << "-af" << "COM5"; QStringList args = QStringList() << "-w" << "-af" << "COM5";