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

Clean up BreakPoint

Browse Source 
Reviewed-by: Friedemann Kleint
Reviewed-by: hjk
This commit is contained in:
Arvid Ephraim Picciani
2010-10-25 14:00:19 +02:00
parent c4ca0060e3
commit 2a569ce073
11 changed files with 303 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
src/plugins/debugger/breakpoint.cpp
View File

@@ -27,13 +27,9 @@
**
**************************************************************************/
#include "breakpoint.h"
#include "breakhandler.h"
#include "debuggeractions.h"
#include "debuggerengine.h"
#include "debuggerstringutils.h"
#include "threadshandler.h"
#include "stackhandler.h"
#include "stackframe.h"
#include <texteditor/basetextmark.h>
@@ -45,111 +41,9 @@
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
//////////////////////////////////////////////////////////////////
//
// BreakpointMarker
//
//////////////////////////////////////////////////////////////////
// Compare file names case insensitively on Windows.
static inline bool fileNameMatch(const QString &f1, const QString &f2)
{
#ifdef Q_OS_WIN
return f1.compare(f2, Qt::CaseInsensitive) == 0;
#else
return f1 == f2;
#endif
}
namespace Debugger {
namespace Internal {
// The red blob on the left side in the cpp editor.
class BreakpointMarker : public TextEditor::BaseTextMark
{
Q_OBJECT
public:
BreakpointMarker(BreakpointData *data, const QString &fileName, int lineNumber)
: BaseTextMark(fileName, lineNumber)
{
m_data = data;
m_pending = true;
//qDebug() << "CREATE MARKER " << fileName << lineNumber;
}
~BreakpointMarker()
{
//qDebug() << "REMOVE MARKER ";
m_data = 0;
}
QIcon icon() const
{
const BreakHandler *handler = m_data->handler();
if (!m_data->enabled)
return handler->disabledBreakpointIcon();
if (!handler->isActive())
return handler->emptyIcon();
return m_pending ? handler->pendingBreakPointIcon() : handler->breakpointIcon();
}
void setPending(bool pending)
{
if (pending == m_pending)
return;
m_pending = pending;
updateMarker();
}
void updateBlock(const QTextBlock &)
{
//qDebug() << "BREAKPOINT MARKER UPDATE BLOCK";
}
void removedFromEditor()
{
if (!m_data)
return;
BreakHandler *handler = m_data->handler();
handler->removeBreakpoint(m_data);
//handler->saveBreakpoints();
handler->updateMarkers();
}
void updateLineNumber(int lineNumber)
{
if (!m_data)
return;
//if (m_data->markerLineNumber == lineNumber)
// return;
if (m_data->markerLineNumber() != lineNumber) {
m_data->setMarkerLineNumber(lineNumber);
// FIXME: Should we tell gdb about the change?
// Ignore it for now, as we would require re-compilation
// and debugger re-start anyway.
if (0 && m_data->bpLineNumber) {
if (!m_data->bpNumber.trimmed().isEmpty()) {
m_data->pending = true;
}
}
}
// Ignore updates to the "real" line number while the debugger is
// running, as this can be triggered by moving the breakpoint to
// the next line that generated code.
// FIXME: Do we need yet another data member?
if (m_data->bpNumber.trimmed().isEmpty()) {
m_data->lineNumber = lineNumber;
m_data->handler()->updateMarkers();
}
}
private:
BreakpointData *m_data;
bool m_pending;
};
//////////////////////////////////////////////////////////////////
//
// BreakpointData
@@ -159,22 +53,30 @@ private:
const char *BreakpointData::throwFunction = "throw";
const char *BreakpointData::catchFunction = "catch";
static quint64 nextBPId() {
/* ok to be not thread-safe
the order does not matter and only the gui
produces authoritative ids. well, for now...
*/
static quint64 i=1;
return ++i;
}
BreakpointData::BreakpointData() :
m_handler(0), enabled(true),
id(nextBPId()), enabled(true),
pending(true), type(BreakpointType),
ignoreCount(0), lineNumber(0), address(0),
useFullPath(false),
bpIgnoreCount(0), bpLineNumber(0),
bpCorrectedLineNumber(0), bpAddress(0),
bpMultiple(false), bpEnabled(true),
m_markerLineNumber(0), marker(0)
m_markerLineNumber(0)
{
}
BreakpointData *BreakpointData::clone() const
{
BreakpointData *data = new BreakpointData();
data->m_handler = m_handler;
data->enabled = enabled;
data->type = type;
data->fileName = fileName;
@@ -199,7 +101,6 @@ BreakpointData *BreakpointData::clone() const
BreakpointData::~BreakpointData()
{
removeMarker();
}
void BreakpointData::clear()
@@ -220,27 +121,6 @@ void BreakpointData::clear()
bpState.clear();
m_markerFileName = fileName;
m_markerLineNumber = lineNumber;
updateMarker();
}
void BreakpointData::removeMarker()
{
BreakpointMarker *m = marker;
marker = 0;
delete m;
}
void BreakpointData::updateMarker()
{
if (marker && (m_markerFileName != marker->fileName()
|| m_markerLineNumber != marker->lineNumber()))
removeMarker();
if (!marker && !m_markerFileName.isEmpty() && m_markerLineNumber > 0)
marker = new BreakpointMarker(this, m_markerFileName, m_markerLineNumber);
if (marker)
marker->setPending(pending);
}
void BreakpointData::setMarkerFileName(const QString &fileName)
@@ -268,44 +148,44 @@ QString BreakpointData::toToolTip() const
QString rc;
QTextStream str(&rc);
str << "<html><body><table>"
<< "<tr><td>" << BreakHandler::tr("Marker File:")
<< "<tr><td>" << tr("Marker File:")
<< "</td><td>" << QDir::toNativeSeparators(m_markerFileName) << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Marker Line:")
<< "<tr><td>" << tr("Marker Line:")
<< "</td><td>" << m_markerLineNumber << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Breakpoint Number:")
<< "<tr><td>" << tr("Breakpoint Number:")
<< "</td><td>" << bpNumber << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Breakpoint Type:")
<< "<tr><td>" << tr("Breakpoint Type:")
<< "</td><td>"
<< (type == BreakpointType ? BreakHandler::tr("Breakpoint")
: type == WatchpointType ? BreakHandler::tr("Watchpoint")
: BreakHandler::tr("Unknown breakpoint type"))
<< (type == BreakpointType ? tr("Breakpoint")
: type == WatchpointType ? tr("Watchpoint")
: tr("Unknown breakpoint type"))
<< "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("State:")
<< "<tr><td>" << tr("State:")
<< "</td><td>" << bpState << "</td></tr>"
<< "</table><br><hr><table>"
<< "<tr><th>" << BreakHandler::tr("Property")
<< "</th><th>" << BreakHandler::tr("Requested")
<< "</th><th>" << BreakHandler::tr("Obtained") << "</th></tr>"
<< "<tr><td>" << BreakHandler::tr("Internal Number:")
<< "<tr><th>" << tr("Property")
<< "</th><th>" << tr("Requested")
<< "</th><th>" << tr("Obtained") << "</th></tr>"
<< "<tr><td>" << tr("Internal Number:")
<< "</td><td>&mdash;</td><td>" << bpNumber << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("File Name:")
<< "<tr><td>" << tr("File Name:")
<< "</td><td>" << QDir::toNativeSeparators(fileName) << "</td><td>" << QDir::toNativeSeparators(bpFileName) << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Function Name:")
<< "<tr><td>" << tr("Function Name:")
<< "</td><td>" << funcName << "</td><td>" << bpFuncName << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Line Number:") << "</td><td>";
<< "<tr><td>" << tr("Line Number:") << "</td><td>";
if (lineNumber)
str << lineNumber;
str << "</td><td>";
if (bpLineNumber)
str << bpLineNumber;
str << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Breakpoint Address:")
<< "<tr><td>" << tr("Breakpoint Address:")
<< "</td><td>";
formatAddress(str, address);
str << "</td><td>";
formatAddress(str, bpAddress);
str << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Corrected Line Number:")
<< "<tr><td>" << tr("Corrected Line Number:")
<< "</td><td>-</td><td>";
if (bpCorrectedLineNumber > 0) {
str << bpCorrectedLineNumber;
@@ -313,21 +193,31 @@ QString BreakpointData::toToolTip() const
str << '-';
}
str << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Condition:")
<< "<tr><td>" << tr("Condition:")
<< "</td><td>" << condition << "</td><td>" << bpCondition << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Ignore Count:") << "</td><td>";
<< "<tr><td>" << tr("Ignore Count:") << "</td><td>";
if (ignoreCount)
str << ignoreCount;
str << "</td><td>";
if (bpIgnoreCount)
str << bpIgnoreCount;
str << "</td></tr>"
<< "<tr><td>" << BreakHandler::tr("Thread Specification:")
<< "<tr><td>" << tr("Thread Specification:")
<< "</td><td>" << threadSpec << "</td><td>" << bpThreadSpec << "</td></tr>"
<< "</table></body></html>";
return rc;
}
// Compare file names case insensitively on Windows.
static inline bool fileNameMatch(const QString &f1, const QString &f2)
{
#ifdef Q_OS_WIN
return f1.compare(f2, Qt::CaseInsensitive) == 0;
#else
return f1 == f2;
#endif
}
bool BreakpointData::isLocatedAt(const QString &fileName_, int lineNumber_,
bool useMarkerPosition) const
{
@@ -339,6 +229,9 @@ bool BreakpointData::isSimilarTo(const BreakpointData *needle) const
{
//qDebug() << "COMPARING " << toString() << " WITH " << needle->toString();
if (id == needle->id && id != 0)
return true;
// Clear hit.
if (bpNumber == needle->bpNumber
&& !bpNumber.isEmpty()
@@ -385,13 +278,6 @@ bool BreakpointData::conditionsMatch() const
return s1 == s2;
}
void BreakpointData::reinsertBreakpoint()
{
QTC_ASSERT(m_handler, return);
m_handler->reinsertBreakpoint(this);
}
} // namespace Internal
} // namespace Debugger
#include "breakpoint.moc"