From 4943d199071ee49679073cc693bad74733ed0d7e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 18 Nov 2010 13:38:58 +0100
Subject: [PATCH] debugger: don't replicate response.fileName as markerFileName
etc.
---
src/plugins/debugger/breakhandler.cpp | 73 +++++++++++++-------------
src/plugins/debugger/breakhandler.h | 4 +-
src/plugins/debugger/gdb/gdbengine.cpp | 31 ++++++-----
src/plugins/debugger/gdb/gdbengine.h | 4 +-
4 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 5c2102a09aa..55a077c54b9 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -298,16 +298,15 @@ void BreakHandler::updateMarker(BreakpointId id)
{
Iterator it = m_storage.find(id);
QTC_ASSERT(it != m_storage.end(), return);
- BreakpointMarker *marker = it->marker;
- if (marker && (it->markerFileName != marker->fileName()
- || it->markerLineNumber != marker->lineNumber()))
+ QString markerFileName = it->markerFileName();
+ int markerLineNumber = it->markerLineNumber();
+ if (it->marker && (markerFileName != it->marker->fileName()
+ || markerLineNumber != it->marker->lineNumber()))
it->destroyMarker();
- if (!marker && !it->markerFileName.isEmpty() && it->markerLineNumber > 0) {
- marker = new BreakpointMarker(id, it->markerFileName, it->markerLineNumber);
- it->marker = marker;
- }
+ if (!it->marker && !markerFileName.isEmpty() && markerLineNumber > 0)
+ it->marker = new BreakpointMarker(id, markerFileName, markerLineNumber);
}
QVariant BreakHandler::headerData(int section,
@@ -391,8 +390,8 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
? data.fileName : response.fileName;
str = QFileInfo(str).fileName();
// FIXME: better?
- //if (data.bpMultiple && str.isEmpty() && !data.markerFileName.isEmpty())
- // str = data.markerFileName;
+ //if (data.multiple && str.isEmpty() && !response.fileName.isEmpty())
+ // str = response.fileName;
str = str.isEmpty() ? empty : str;
if (data.useFullPath)
str = QDir::toNativeSeparators(QLatin1String("/.../") + str);
@@ -402,8 +401,8 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
case 3:
if (role == Qt::DisplayRole) {
// FIXME: better?
- //if (data.bpMultiple && str.isEmpty() && !data.markerFileName.isEmpty())
- // str = data.markerLineNumber;
+ //if (data.multiple && str.isEmpty() && !reponse.fileName.isEmpty())
+ // str = response.lineNumber;
const int nr = it->isPending()
? data.lineNumber : response.lineNumber;
return nr ? QString::number(nr) : empty;
@@ -529,10 +528,8 @@ void BreakHandler::setMarkerFileAndLine(BreakpointId id,
{
Iterator it = m_storage.find(id);
QTC_ASSERT(it != m_storage.end(), return);
- if (it->markerFileName == fileName && it->markerLineNumber == lineNumber)
+ if (it->response.fileName == fileName && it->response.lineNumber == lineNumber)
return;
- it->markerFileName = fileName;
- it->markerLineNumber = lineNumber;
it->response.fileName = fileName;
it->response.lineNumber = lineNumber;
updateMarker(id);
@@ -744,8 +741,8 @@ void BreakHandler::appendBreakpoint(const BreakpointParameters &data)
BreakpointId id(++currentId);
BreakpointItem item;
item.data = data;
- item.markerFileName = data.fileName;
- item.markerLineNumber = data.lineNumber;
+ item.response.fileName = data.fileName;
+ item.response.lineNumber = data.lineNumber;
m_storage.insert(id, item);
scheduleSynchronization();
}
@@ -851,8 +848,8 @@ void BreakHandler::updateLineNumberFromMarker(BreakpointId id, int lineNumber)
QTC_ASSERT(it != m_storage.end(), return);
//if (data.markerLineNumber == lineNumber)
// return;
- if (it->markerLineNumber != lineNumber) {
- it->markerLineNumber = lineNumber;
+ if (it->response.lineNumber != lineNumber) {
+ it->response.lineNumber = lineNumber;
// FIXME: Should we tell gdb about the change?
// Ignore it for now, as we would require re-compilation
// and debugger re-start anyway.
@@ -868,8 +865,8 @@ void BreakHandler::updateLineNumberFromMarker(BreakpointId id, int lineNumber)
// FIXME: Do we need yet another data member?
if (it->response.number == 0) {
it->data.lineNumber = lineNumber;
- updateMarker(id);
}
+ updateMarker(id);
}
BreakpointIds BreakHandler::allBreakpointIds() const
@@ -946,7 +943,7 @@ void BreakHandler::setBreakpointData(BreakpointId id, const BreakpointParameters
//////////////////////////////////////////////////////////////////
BreakHandler::BreakpointItem::BreakpointItem()
- : state(BreakpointNew), engine(0), marker(0), markerLineNumber(0)
+ : state(BreakpointNew), engine(0), marker(0)
{}
void BreakHandler::BreakpointItem::destroyMarker()
@@ -956,6 +953,17 @@ void BreakHandler::BreakpointItem::destroyMarker()
delete m;
}
+QString BreakHandler::BreakpointItem::markerFileName() const
+{
+ return !response.fileName.isEmpty() ? response.fileName : data.fileName;
+}
+
+
+int BreakHandler::BreakpointItem::markerLineNumber() const
+{
+ return response.lineNumber ? response.lineNumber : data.lineNumber;
+}
+
static void formatAddress(QTextStream &str, quint64 address)
{
if (address) {
@@ -996,8 +1004,8 @@ bool BreakHandler::BreakpointItem::needsChange() const
bool BreakHandler::BreakpointItem::isLocatedAt
(const QString &fileName, int lineNumber, bool useMarkerPosition) const
{
- int line = useMarkerPosition ? markerLineNumber : data.lineNumber;
- return lineNumber == line && fileNameMatch(fileName, markerFileName);
+ int line = useMarkerPosition ? response.lineNumber : data.lineNumber;
+ return lineNumber == line && fileNameMatch(fileName, response.fileName);
}
QString BreakHandler::BreakpointItem::toToolTip() const
@@ -1039,10 +1047,6 @@ QString BreakHandler::BreakpointItem::toToolTip() const
<< "</td><td>" << state << " (" << stateToString(state) << ")</td></tr>"
<< "<tr><td>" << tr("Engine:")
<< "</td><td>" << (engine ? engine->objectName() : "0") << "</td></tr>"
- << "<tr><td>" << tr("Marker File:")
- << "</td><td>" << QDir::toNativeSeparators(markerFileName) << "</td></tr>"
- << "<tr><td>" << tr("Marker Line:")
- << "</td><td>" << markerLineNumber << "</td></tr>"
<< "<tr><td>" << tr("Breakpoint Number:")
<< "</td><td>" << response.number << "</td></tr>"
<< "<tr><td>" << tr("Breakpoint Type:")
@@ -1055,20 +1059,17 @@ QString BreakHandler::BreakpointItem::toToolTip() const
<< "</th><th>" << tr("Obtained") << "</th></tr>"
<< "<tr><td>" << tr("Internal Number:")
<< "</td><td>—</td><td>" << response.number << "</td></tr>"
+ << "<tr><td>" << tr("Function Name:")
+ << "</td><td>" << data.functionName
+ << "</td><td>" << response.functionName
+ << "</td></tr>"
<< "<tr><td>" << tr("File Name:")
<< "</td><td>" << QDir::toNativeSeparators(data.fileName)
<< "</td><td>" << QDir::toNativeSeparators(response.fileName)
<< "</td></tr>"
- << "<tr><td>" << tr("Function Name:")
- << "</td><td>" << data.functionName
- << "</td><td>" << response.functionName << "</td></tr>"
- << "<tr><td>" << tr("Line Number:") << "</td><td>";
- if (data.lineNumber)
- str << data.lineNumber;
- str << "</td><td>";
- if (response.lineNumber)
- str << response.lineNumber;
- str << "</td></tr>"
+ << "<tr><td>" << tr("Line Number:")
+ << "</td><td>" << data.lineNumber
+ << "</td><td>" << response.lineNumber << "</td></tr>"
<< "<tr><td>" << tr("Breakpoint Address:")
<< "</td><td>";
formatAddress(str, data.address);
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 1fb82988a97..05fdd0f6c17 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -183,14 +183,14 @@ private:
bool isLocatedAt(const QString &fileName, int lineNumber,
bool useMarkerPosition) const;
QString toToolTip() const;
+ QString markerFileName() const;
+ int markerLineNumber() const;
BreakpointParameters data;
BreakpointState state; // Current state of breakpoint.
DebuggerEngine *engine; // Engine currently handling the breakpoint.
BreakpointResponse response;
BreakpointMarker *marker;
- QString markerFileName; // Used to locate the marker.
- int markerLineNumber;
};
typedef QHash<BreakpointId, BreakpointItem> BreakpointStorage;
typedef BreakpointStorage::ConstIterator ConstIterator;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 0573ffaef8f..01a06569696 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1171,7 +1171,6 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
const QString fileName =
QString::fromUtf8(frame.findChild("fullname").data());
const int lineNumber = frame.findChild("line").data().toInt();
- qDebug() << "HIT " << fileName << lineNumber;
if (!fileName.isEmpty()) {
BreakHandler *handler = breakHandler();
BreakpointId id = handler->findBreakpointByNumber(bkptno);
@@ -2178,6 +2177,21 @@ void GdbEngine::handleWatchInsert(const GdbResponse &response)
}
}
+void GdbEngine::attemptAdjustBreakpointLocation(BreakpointId id)
+{
+ if (!debuggerCore()->boolSetting(AdjustBreakpointLocations))
+ return;
+ BreakpointResponse response = breakHandler()->response(id);
+ if (response.address == 0 || response.correctedLineNumber != 0)
+ return;
+ // Prevent endless loop.
+ response.correctedLineNumber = -1;
+ breakHandler()->setResponse(id, response);
+ postCommand("info line *0x" + QByteArray::number(response.address, 16),
+ NeedsStop | RebuildBreakpointModel,
+ CB(handleInfoLine), id);
+}
+
void GdbEngine::handleBreakInsert1(const GdbResponse &response)
{
const int id = response.cookie.toInt();
@@ -2185,7 +2199,7 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response)
// Interesting only on Mac?
GdbMi bkpt = response.data.findChild("bkpt");
updateBreakpointDataFromOutput(id, bkpt);
- //attempAdjustBreakpointLocation(id);
+ attemptAdjustBreakpointLocation(id);
} else {
// Some versions of gdb like "GNU gdb (GDB) SUSE (6.8.91.20090930-2.4)"
// know how to do pending breakpoints using CLI but not MI. So try
@@ -2635,18 +2649,7 @@ void GdbEngine::changeBreakpoint(BreakpointId id)
//continue;
}
- if (response.address && response.correctedLineNumber == 0) {
- // Prevent endless loop.
- BreakpointResponse r = response;
- r.correctedLineNumber = -1;
- breakHandler()->setResponse(id, r);
- if (debuggerCore()->boolSetting(AdjustBreakpointLocations)) {
- postCommand(
- "info line *0x" + QByteArray::number(response.address, 16),
- NeedsStop | RebuildBreakpointModel,
- CB(handleInfoLine), id);
- }
- }
+ attemptAdjustBreakpointLocation(id);
}
void GdbEngine::removeBreakpoint(BreakpointId id)
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 2b952416f91..5acd76ab954 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -361,6 +361,7 @@ private: ////////// View & Data Stuff //////////
QByteArray breakpointLocation(BreakpointId id);
QString breakLocation(const QString &file) const;
void reloadBreakListInternal();
+ void attemptAdjustBreakpointLocation(BreakpointId id);
//
// Modules specific stuff
@@ -448,7 +449,8 @@ private: ////////// View & Data Stuff //////////
virtual void setToolTipExpression(const QPoint &mousePos,
TextEditor::ITextEditor *editor, int cursorPos);
- virtual void assignValueInDebugger(const Internal::WatchData *w, const QString &expr, const QVariant &value);
+ virtual void assignValueInDebugger(const WatchData *data,
+ const QString &expr, const QVariant &value);
virtual void fetchMemory(MemoryViewAgent *agent, QObject *token,
quint64 addr, quint64 length);
--
GitLab