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

Debugger: Check for skippable frames early

Browse Source 
This avoids unnecessarily opening of files with functions that
are skip.

Change-Id: Ie435949ad4033444ad5814a91109f33e022711d0
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-12-20 10:47:20 +01:00
parent 2afb31f371
commit 6b2b52937d
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1106,10 +1106,37 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
return; return;
} }
const QString reason = data["reason"].data();
const GdbMi frame = data["frame"];
// Jump over well-known frames.
static int stepCounter = 0;
if (debuggerSettings()->skipKnownFrames.value()) {
if (reason == "end-stepping-range" || reason == "function-finished") {
//showMessage(frame.toString());
QString funcName = frame["function"].data();
QString fileName = frame["file"].data();
if (isLeavableFunction(funcName, fileName)) {
//showMessage(_("LEAVING ") + funcName);
++stepCounter;
executeStepOut();
return;
}
if (isSkippableFunction(funcName, fileName)) {
//showMessage(_("SKIPPING ") + funcName);
++stepCounter;
executeStepIn(false);
return;
}
//if (stepCounter)
// qDebug() << "STEPCOUNTER:" << stepCounter;
stepCounter = 0;
}
}
GdbMi threads = data["stopped-thread"]; GdbMi threads = data["stopped-thread"];
threadsHandler()->notifyStopped(threads.data()); threadsHandler()->notifyStopped(threads.data());
const QString reason = data["reason"].data();
if (isExitedReason(reason)) { if (isExitedReason(reason)) {
// // The user triggered a stop, but meanwhile the app simply exited ... // // The user triggered a stop, but meanwhile the app simply exited ...
// QTC_ASSERT(state() == InferiorStopRequested // QTC_ASSERT(state() == InferiorStopRequested
@@ -1148,7 +1175,6 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
QString fullName; QString fullName;
QString function; QString function;
QString language; QString language;
const GdbMi frame = data["frame"];
if (frame.isValid()) { if (frame.isValid()) {
const GdbMi lineNumberG = frame["line"]; const GdbMi lineNumberG = frame["line"];
function = frame["function"].data(); // V4 protocol function = frame["function"].data(); // V4 protocol
@@ -1259,31 +1285,6 @@ void GdbEngine::handleStop1(const GdbMi &data)
return; return;
} }
// Jump over well-known frames.
static int stepCounter = 0;
if (debuggerSettings()->skipKnownFrames.value()) {
if (reason == "end-stepping-range" || reason == "function-finished") {
//showMessage(frame.toString());
QString funcName = frame["function"].data();
QString fileName = frame["file"].data();
if (isLeavableFunction(funcName, fileName)) {
//showMessage(_("LEAVING ") + funcName);
++stepCounter;
executeStepOut();
return;
}
if (isSkippableFunction(funcName, fileName)) {
//showMessage(_("SKIPPING ") + funcName);
++stepCounter;
executeStepIn(false);
return;
}
//if (stepCounter)
// qDebug() << "STEPCOUNTER:" << stepCounter;
stepCounter = 0;
}
}
// Show return value if possible, usually with reason "function-finished". // Show return value if possible, usually with reason "function-finished".
// *stopped,reason="function-finished",frame={addr="0x080556da", // *stopped,reason="function-finished",frame={addr="0x080556da",
// func="testReturnValue",args=[],file="/../app.cpp", // func="testReturnValue",args=[],file="/../app.cpp",