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

Debugger: Move rarely interesting [extraData] out of sight

Browse Source 
Together with [metaObject] and [connectionLists]. This also
saves a few cycles in the main code path.

Change-Id: I8460267f04a0c1d63ab0f991450863669cc760e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-08-01 12:32:38 +02:00
committed by hjk
parent bb55a510cf
commit 36875ad4f3
1 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
share/qtcreator/debugger/dumper.py
View File

@@ -1506,6 +1506,23 @@ class DumperBase:
for i in range(size):
yield self.createValue(data + i * innerSize, innerType)
def putTypedPointer(self, name, addr, typeName):
""" Prints a typed pointer, expandable if the type can be resolved,
and without children otherwise """
with SubItem(self, name):
self.putAddress(addr)
self.putValue("@0x%x" % addr)
typeObj = self.lookupType(typeName)
if typeObj:
self.putType(typeObj)
self.putNumChild(1)
if self.isExpanded():
with Children(self):
self.putFields(self.createValue(addr, typeObj))
else:
self.putType(typeName)
self.putNumChild(0)
def putStructGuts(self, value):
self.putEmptyValue()
#metaObjectPtr = self.extractMetaObjectPtr(self.addressOf(value), value.type)
@@ -1613,11 +1630,18 @@ class DumperBase:
extraData = 0
if qobjectPtr:
isQt5 = self.qtVersion() >= 0x50000
extraDataOffset = 5 * ptrSize + 8 if isQt5 else 6 * ptrSize + 8
# dd = value["d_ptr"]["d"] is just behind the vtable.
#isQt5 = self.qtVersion() >= 0x50000
#extraDataOffset = 5 * ptrSize + 8 if isQt5 else 6 * ptrSize + 8
# (QObjectData/QObjectPrivate) dd = value["d_ptr"]["d"] is just behind the vtable.
dd = self.extractPointer(qobjectPtr + ptrSize)
extraData = self.extractPointer(dd + extraDataOffset)
if self.qtVersion() >= 0x50000:
(dvtablePtr, qptr, parentPtr, childrenDPtr, flags, postedEvents, dynMetaObjectPtr,
extraData, threadDataPtr, connectionListsPtr, sendersPtr, currentSenderPtr) \
= self.extractStruct('PPPPIIPPPPPP', dd, 10 * ptrSize + 8)
else:
(dvtablePtr, qptr, parentPtr, childrenDPtr, flags, postedEvents, dynMetaObjectPtr,
extraData, threadDataPtr, connectionListsPtr, sendersPtr, currentSenderPtr) \
= (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
if qobjectPtr:
qobjectType = self.lookupQtType("QObject")
@@ -1697,7 +1721,28 @@ class DumperBase:
t = self.extractStruct('IIIII', dataPtr + 56 + i * 20, 20)
putt("method %d" % i, "%s %s %s %s %s" % t)
putt("[extraData]", "0x%x" % toInteger(extraData), "void *")
if isQObject:
with SubItem(self, "[extra]"):
self.put('sortgroup="1"')
self.putEmptyValue()
self.putNumChild(1)
if self.isExpanded():
with Children(self):
if extraData:
self.putTypedPointer("[extraData]", extraData,
self.qtNamespace() + "QObjectPrivate::ExtraData")
if connectionListsPtr:
self.putTypedPointer("[connectionLists]", connectionListsPtr,
self.qtNamespace() + "QObjectConnectionListVector")
with SubItem(self, "[metaObject]"):
self.putAddress(metaObjectPtr)
self.putNumChild(1)
if self.isExpanded():
with Children(self):
self.putQObjectGutsHelper(0, 0, -1, metaObjectPtr, "QMetaObject")
if isQMetaObject or isQObject:
with SubItem(self, "[properties]"):
@@ -1781,22 +1826,19 @@ class DumperBase:
putt("[localindex]", str(i))
putt("[globalindex]", str(globalOffset + i))
if isQObject:
with SubItem(self, "[metaObject]"):
self.putAddress(metaObjectPtr)
self.putNumChild(1)
if self.isExpanded():
with Children(self):
self.putQObjectGutsHelper(0, 0, -1, metaObjectPtr, "QMetaObject")
if isQObject:
with SubItem(self, "[d]"):
self.put('sortgroup="15"')
try:
self.putItem(qobject["d_ptr"]["d"])
qobjectPrivateType = self.lookupQtType("QObjectPrivate")
self.putItem(qobject["d_ptr"]["d"].dereference().cast(qobjectPrivateType))
except:
self.putNumChild(0)
self.putSpecialValue("notaccessible")
try:
self.putItem(qobject["d_ptr"]["d"])
except:
self.putNumChild(0)
self.putType(self.qtNamespace() + "QObjectData *")
self.putSpecialValue("notaccessible")
if isQMetaObject:
with SubItem(self, "[superdata]"):