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

debugger: assume valid ref counts are always smaller than 1 million

Browse Source
This commit is contained in:
hjk
2010-01-04 14:14:14 +01:00
parent b0fb396dc9
commit 46c114e895
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/qtcreator/gdbmacros/dumper.py
View File

@@ -151,6 +151,11 @@ def check(exp):
if not exp: if not exp:
raise RuntimeError("Check failed") raise RuntimeError("Check failed")
def checkRef(ref):
count = ref["_q_value"]
check(count > 0)
check(count < 1000000) # assume there aren't a million references to any object
#def couldBePointer(p, align): #def couldBePointer(p, align):
# type = gdb.lookup_type("unsigned int") # type = gdb.lookup_type("unsigned int")
# ptr = gdb.Value(p).cast(type) # ptr = gdb.Value(p).cast(type)
@@ -235,7 +240,7 @@ def encodeByteArray(value):
size = d_ptr['size'] size = d_ptr['size']
alloc = d_ptr['alloc'] alloc = d_ptr['alloc']
check(0 <= size and size <= alloc and alloc <= 100*1000*1000) check(0 <= size and size <= alloc and alloc <= 100*1000*1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
if size > 0: if size > 0:
checkAccess(data, 4) checkAccess(data, 4)
checkAccess(data + size) == 0 checkAccess(data + size) == 0
@@ -253,7 +258,7 @@ def encodeString(value):
if size > 0: if size > 0:
checkAccess(data, 4) checkAccess(data, 4)
checkAccess(data + size * 2) == 0 checkAccess(data + size * 2) == 0
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
p = gdb.Value(d_ptr["data"]) p = gdb.Value(d_ptr["data"])
s = "" s = ""
for i in xrange(size): for i in xrange(size):

21
share/qtcreator/gdbmacros/gdbmacros.py
View File

@@ -260,7 +260,7 @@ def qdump__QHash(d, item):
hashNodeType = e_ptr.type hashNodeType = e_ptr.type
check(0 <= size and size <= 100 * 1000 * 1000) check(0 <= size and size <= 100 * 1000 * 1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putItemCount(size) d.putItemCount(size)
d.putNumChild(size) d.putNumChild(size)
@@ -324,8 +324,7 @@ def qdump__QList(d, item):
#if n > 0: #if n > 0:
# checkAccess(&list.front()) # checkAccess(&list.front())
# checkAccess(&list.back()) # checkAccess(&list.back())
checkRef(d_ptr["ref"])
check(d_ptr["ref"]["_q_value"] > 0)
# Additional checks on pointer arrays. # Additional checks on pointer arrays.
innerType = item.value.type.template_argument(0) innerType = item.value.type.template_argument(0)
@@ -371,7 +370,7 @@ def qdump__QImage(d, item):
if isNull(d_ptr): if isNull(d_ptr):
d.putValue("(null)") d.putValue("(null)")
else: else:
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putValue("(%dx%d)" % (d_ptr["width"], d_ptr["height"])) d.putValue("(%dx%d)" % (d_ptr["width"], d_ptr["height"]))
d.putNumChild(0) d.putNumChild(0)
#d.putNumChild(1) #d.putNumChild(1)
@@ -395,7 +394,7 @@ def qdump__QLinkedList(d, item):
e_ptr = item.value["e"] e_ptr = item.value["e"]
n = d_ptr["size"] n = d_ptr["size"]
check(0 <= n and n <= 100*1000*1000) check(0 <= n and n <= 100*1000*1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putItemCount(n) d.putItemCount(n)
d.putNumChild(n) d.putNumChild(n)
if d.isExpanded(item): if d.isExpanded(item):
@@ -450,7 +449,7 @@ def qdump__QMap(d, item):
e_ptr = item.value["e"].dereference() e_ptr = item.value["e"].dereference()
n = d_ptr["size"] n = d_ptr["size"]
check(0 <= n and n <= 100*1000*1000) check(0 <= n and n <= 100*1000*1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putItemCount(n) d.putItemCount(n)
d.putNumChild(n) d.putNumChild(n)
@@ -561,7 +560,7 @@ def qdump__QObject(d, item):
#d.putValue("") #d.putValue("")
d.putStringValue(objectName) d.putStringValue(objectName)
#QSignalMapper::staticMetaObject #QSignalMapper::staticMetaObject
#check(d_ptr["ref"]["_q_value"] > 0) #checkRef(d_ptr["ref"])
d.putNumChild(4) d.putNumChild(4)
if d.isExpanded(item): if d.isExpanded(item):
d.beginChildren() d.beginChildren()
@@ -1275,7 +1274,7 @@ def qdump__QPixmap(d, item):
if isNull(d_ptr): if isNull(d_ptr):
d.putValue("(null)") d.putValue("(null)")
else: else:
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putValue("(%dx%d)" % (d_ptr["w"], d_ptr["h"])) d.putValue("(%dx%d)" % (d_ptr["w"], d_ptr["h"]))
d.putNumChild(0) d.putNumChild(0)
@@ -1379,7 +1378,7 @@ def qdump__QSet(d, item):
hashNodeType = e_ptr.type hashNodeType = e_ptr.type
check(0 <= size and size <= 100 * 1000 * 1000) check(0 <= size and size <= 100 * 1000 * 1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putItemCount(size) d.putItemCount(size)
d.putNumChild(size) d.putNumChild(size)
@@ -1440,7 +1439,7 @@ def qdump__QStringList(d, item):
check(size <= 10 * 1000 * 1000) check(size <= 10 * 1000 * 1000)
# checkAccess(&list.front()) # checkAccess(&list.front())
# checkAccess(&list.back()) # checkAccess(&list.back())
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
d.putItemCount(size) d.putItemCount(size)
d.putNumChild(size) d.putNumChild(size)
if d.isExpanded(item): if d.isExpanded(item):
@@ -1619,7 +1618,7 @@ def qdump__QVector(d, item):
size = d_ptr["size"] size = d_ptr["size"]
check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000) check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000)
check(d_ptr["ref"]["_q_value"] > 0) checkRef(d_ptr["ref"])
innerType = item.value.type.template_argument(0) innerType = item.value.type.template_argument(0)
d.putItemCount(size) d.putItemCount(size)