From ae4d3c52e69b8579409f5a21330f43abe2c78479 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 10 Nov 2016 22:16:48 +0100 Subject: [PATCH] Debugger: Sanitize report of timings Use Python's list and dict output directly, instead of a manually stringified version thereof. Also, report milliseconds instead of microseconds. Change-Id: Ibcbdea732e7ecc58fd672bc5da794832215865b4 Reviewed-by: hjk --- share/qtcreator/debugger/dumper.py | 2 +- share/qtcreator/debugger/gdbbridge.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 3e55dd77296..2027f29728b 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -399,7 +399,7 @@ class DumperBase: def ping(self, key): return - elapsed = int(1000000 * (time.time() - self.pretimings[key])) + elapsed = int(1000 * (time.time() - self.pretimings[key])) self.timings.append([key, elapsed]) def childRange(self): diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 5b8c0d38f69..874cfe783f9 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -725,11 +725,12 @@ class Dumper(DumperBase): self.qtNamespaceToReport = None self.output.append(',partial="%d"' % isPartial) + self.output.append(',counts=%s' % self.counts) + self.output.append(',timimgs=%s' % self.timings) - self.preping('safePrint') + tt = time.time() safePrint(''.join(self.output)) - self.ping('safePrint') - safePrint('"%s"' % str(self.dumpStats())) + print(',time="%d"' % int(1000 * (tt - time.time()))) def parseAndEvaluate(self, exp): #warn('EVALUATE '%s'' % exp)