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

Fixes: debugger: move custom dumper initialization into the first

Browse Source 
watch view update
This commit is contained in:
hjk
2009-02-11 14:39:31 +01:00
parent df16699ed9
commit e033239d7b
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/debugger/gdbengine.cpp
View File

@@ -1181,7 +1181,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
return; return;
} }
tryLoadCustomDumpers(); //tryLoadCustomDumpers();
// jump over well-known frames // jump over well-known frames
static int stepCounter = 0; static int stepCounter = 0;
@@ -3444,11 +3444,12 @@ void GdbEngine::handleEvaluateExpression(const GdbResultRecord &record,
void GdbEngine::handleDumpCustomSetup(const GdbResultRecord &record) void GdbEngine::handleDumpCustomSetup(const GdbResultRecord &record)
{ {
qDebug() << "CUSTOM SETUP RESULT: " << record.toString(); //qDebug() << "CUSTOM SETUP RESULT: " << record.toString();
if (record.resultClass == GdbResultDone) { if (record.resultClass == GdbResultDone) {
} else if (record.resultClass == GdbResultError) { } else if (record.resultClass == GdbResultError) {
QString msg = record.data.findChild("msg").data(); QString msg = record.data.findChild("msg").data();
qDebug() << "CUSTOM DUMPER SETUP ERROR MESSAGE: " << msg; //qDebug() << "CUSTOM DUMPER SETUP ERROR MESSAGE: " << msg;
q->showStatusMessage(tr("Custom dumper setup: %1").arg(msg), 10000);
} }
} }
@@ -3589,6 +3590,7 @@ void GdbEngine::updateLocals()
setTokenBarrier(); setTokenBarrier();
m_pendingRequests = 0; m_pendingRequests = 0;
PENDING_DEBUG("\nRESET PENDING"); PENDING_DEBUG("\nRESET PENDING");
m_toolTipCache.clear(); m_toolTipCache.clear();
m_toolTipExpression.clear(); m_toolTipExpression.clear();
@@ -3600,6 +3602,8 @@ void GdbEngine::updateLocals()
sendSynchronizedCommand(cmd, StackListArguments); // stage 1/2 sendSynchronizedCommand(cmd, StackListArguments); // stage 1/2
// '2' is 'list with type and value' // '2' is 'list with type and value'
sendSynchronizedCommand("-stack-list-locals 2", StackListLocals); // stage 2/2 sendSynchronizedCommand("-stack-list-locals 2", StackListLocals); // stage 2/2
tryLoadCustomDumpers();
} }
void GdbEngine::handleStackListArguments(const GdbResultRecord &record) void GdbEngine::handleStackListArguments(const GdbResultRecord &record)
@@ -3958,15 +3962,17 @@ void GdbEngine::tryLoadCustomDumpers()
QString lib = q->m_buildDir + "/qtc-gdbmacros/libgdbmacros.so"; QString lib = q->m_buildDir + "/qtc-gdbmacros/libgdbmacros.so";
if (QFileInfo(lib).isExecutable()) { if (QFileInfo(lib).isExecutable()) {
//sendCommand("p dlopen"); //sendCommand("p dlopen");
if (qq->useFastStart()) //if (qq->useFastStart())
sendCommand("set stop-on-solib-events 0"); // sendCommand("set stop-on-solib-events 0");
QString flag = QString::number(RTLD_NOW); QString flag = QString::number(RTLD_NOW);
sendCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")"); sendSynchronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")",
WatchDumpCustomSetup);
// some older systems like CentOS 4.6 prefer this: // some older systems like CentOS 4.6 prefer this:
sendCommand("call (void)__dlopen(\"" + lib + "\", " + flag + ")"); sendSynchronizedCommand("call (void)__dlopen(\"" + lib + "\", " + flag + ")",
sendCommand("sharedlibrary " + dotEscape(lib)); WatchDumpCustomSetup);
if (qq->useFastStart()) sendSynchronizedCommand("sharedlibrary " + dotEscape(lib));
sendCommand("set stop-on-solib-events 1"); //if (qq->useFastStart())
// sendCommand("set stop-on-solib-events 1");
} else { } else {
qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: " qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: "
<< lib << QFileInfo(lib).isExecutable(); << lib << QFileInfo(lib).isExecutable();
@@ -3976,13 +3982,14 @@ void GdbEngine::tryLoadCustomDumpers()
QString lib = q->m_buildDir + "/qtc-gdbmacros/libgdbmacros.dylib"; QString lib = q->m_buildDir + "/qtc-gdbmacros/libgdbmacros.dylib";
if (QFileInfo(lib).isExecutable()) { if (QFileInfo(lib).isExecutable()) {
//sendCommand("p dlopen"); // FIXME: remove me //sendCommand("p dlopen"); // FIXME: remove me
if (qq->useFastStart()) //if (qq->useFastStart())
sendCommand("set stop-on-solib-events 0"); // sendCommand("set stop-on-solib-events 0");
QString flag = QString::number(RTLD_NOW); QString flag = QString::number(RTLD_NOW);
sendCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")"); sendSyncronizedCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")",
sendCommand("sharedlibrary " + dotEscape(lib)); WatchDumpCustomSetup);
if (qq->useFastStart()) sendSyncronizedCommand("sharedlibrary " + dotEscape(lib));
sendCommand("set stop-on-solib-events 1"); //if (qq->useFastStart())
// sendCommand("set stop-on-solib-events 1");
} else { } else {
qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: " qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: "
<< lib << QFileInfo(lib).isExecutable(); << lib << QFileInfo(lib).isExecutable();
@@ -3991,14 +3998,15 @@ void GdbEngine::tryLoadCustomDumpers()
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QString lib = q->m_buildDir + "/qtc-gdbmacros/debug/gdbmacros.dll"; QString lib = q->m_buildDir + "/qtc-gdbmacros/debug/gdbmacros.dll";
if (QFileInfo(lib).exists()) { if (QFileInfo(lib).exists()) {
if (qq->useFastStart()) //if (qq->useFastStart())
sendCommand("set stop-on-solib-events 0"); // sendCommand("set stop-on-solib-events 0");
//sendCommand("handle SIGSEGV pass stop print"); //sendCommand("handle SIGSEGV pass stop print");
//sendCommand("set unwindonsignal off"); //sendCommand("set unwindonsignal off");
sendCommand("call LoadLibraryA(\"" + lib + "\")"); sendSyncronizedCommand("call LoadLibraryA(\"" + lib + "\")",
sendCommand("sharedlibrary " + dotEscape(lib)); WatchDumpCustomSetup);
if (qq->useFastStart()) sendSyncronizedCommand("sharedlibrary " + dotEscape(lib));
sendCommand("set stop-on-solib-events 1"); //if (qq->useFastStart())
// sendCommand("set stop-on-solib-events 1");
} else { } else {
qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: " qDebug() << "DEBUG HELPER LIBRARY IS NOT USABLE: "
<< lib << QFileInfo(lib).isExecutable(); << lib << QFileInfo(lib).isExecutable();
@@ -4006,9 +4014,9 @@ void GdbEngine::tryLoadCustomDumpers()
#endif #endif
// retreive list of dumpable classes // retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)", sendSynchronizedCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)",
GdbQueryDataDumper1); GdbQueryDataDumper1);
sendCommand("p (char*)qDumpOutBuffer", GdbQueryDataDumper2); sendSynchronizedCommand("p (char*)qDumpOutBuffer", GdbQueryDataDumper2);
} }