xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf scripts python: exported-sql-viewer.py: Add CallGraphModelParams

Browse Source 
Add a parameter to call graph and call tree, to determine whether IPC
information is available.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190520113728.14389-20-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
2019-05-20 14:37:25 +03:00
committed by Arnaldo Carvalho de Melo
parent 530e22fd5c
commit 4a0979d4b4
1 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tools/perf/scripts/python/exported-sql-viewer.py
View File

@@ -200,9 +200,10 @@ class Thread(QThread):
class TreeModel(QAbstractItemModel): class TreeModel(QAbstractItemModel):
def __init__(self, glb, parent=None): def __init__(self, glb, params, parent=None):
super(TreeModel, self).__init__(parent) super(TreeModel, self).__init__(parent)
self.glb = glb self.glb = glb
self.params = params
self.root = self.GetRoot() self.root = self.GetRoot()
self.last_row_read = 0 self.last_row_read = 0
@@ -463,8 +464,9 @@ class FindBar():
class CallGraphLevelItemBase(object): class CallGraphLevelItemBase(object):
def __init__(self, glb, row, parent_item): def __init__(self, glb, params, row, parent_item):
self.glb = glb self.glb = glb
self.params = params
self.row = row self.row = row
self.parent_item = parent_item self.parent_item = parent_item
self.query_done = False; self.query_done = False;
@@ -503,8 +505,8 @@ class CallGraphLevelItemBase(object):
class CallGraphLevelTwoPlusItemBase(CallGraphLevelItemBase): class CallGraphLevelTwoPlusItemBase(CallGraphLevelItemBase):
def __init__(self, glb, row, comm_id, thread_id, call_path_id, time, branch_count, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, call_path_id, time, branch_count, parent_item):
super(CallGraphLevelTwoPlusItemBase, self).__init__(glb, row, parent_item) super(CallGraphLevelTwoPlusItemBase, self).__init__(glb, params, row, parent_item)
self.comm_id = comm_id self.comm_id = comm_id
self.thread_id = thread_id self.thread_id = thread_id
self.call_path_id = call_path_id self.call_path_id = call_path_id
@@ -525,7 +527,7 @@ class CallGraphLevelTwoPlusItemBase(CallGraphLevelItemBase):
" GROUP BY call_path_id, name, short_name" " GROUP BY call_path_id, name, short_name"
" ORDER BY call_path_id") " ORDER BY call_path_id")
while query.next(): while query.next():
child_item = CallGraphLevelThreeItem(self.glb, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), int(query.value(5)), self) child_item = CallGraphLevelThreeItem(self.glb, self.params, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), int(query.value(5)), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
@@ -533,8 +535,8 @@ class CallGraphLevelTwoPlusItemBase(CallGraphLevelItemBase):
class CallGraphLevelThreeItem(CallGraphLevelTwoPlusItemBase): class CallGraphLevelThreeItem(CallGraphLevelTwoPlusItemBase):
def __init__(self, glb, row, comm_id, thread_id, call_path_id, name, dso, count, time, branch_count, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, call_path_id, name, dso, count, time, branch_count, parent_item):
super(CallGraphLevelThreeItem, self).__init__(glb, row, comm_id, thread_id, call_path_id, time, branch_count, parent_item) super(CallGraphLevelThreeItem, self).__init__(glb, params, row, comm_id, thread_id, call_path_id, time, branch_count, parent_item)
dso = dsoname(dso) dso = dsoname(dso)
self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ] self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ]
self.dbid = call_path_id self.dbid = call_path_id
@@ -543,8 +545,8 @@ class CallGraphLevelThreeItem(CallGraphLevelTwoPlusItemBase):
class CallGraphLevelTwoItem(CallGraphLevelTwoPlusItemBase): class CallGraphLevelTwoItem(CallGraphLevelTwoPlusItemBase):
def __init__(self, glb, row, comm_id, thread_id, pid, tid, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, pid, tid, parent_item):
super(CallGraphLevelTwoItem, self).__init__(glb, row, comm_id, thread_id, 1, 0, 0, parent_item) super(CallGraphLevelTwoItem, self).__init__(glb, params, row, comm_id, thread_id, 1, 0, 0, parent_item)
self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""] self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""]
self.dbid = thread_id self.dbid = thread_id
@@ -561,8 +563,8 @@ class CallGraphLevelTwoItem(CallGraphLevelTwoPlusItemBase):
class CallGraphLevelOneItem(CallGraphLevelItemBase): class CallGraphLevelOneItem(CallGraphLevelItemBase):
def __init__(self, glb, row, comm_id, comm, parent_item): def __init__(self, glb, params, row, comm_id, comm, parent_item):
super(CallGraphLevelOneItem, self).__init__(glb, row, parent_item) super(CallGraphLevelOneItem, self).__init__(glb, params, row, parent_item)
self.data = [comm, "", "", "", "", "", ""] self.data = [comm, "", "", "", "", "", ""]
self.dbid = comm_id self.dbid = comm_id
@@ -574,7 +576,7 @@ class CallGraphLevelOneItem(CallGraphLevelItemBase):
" INNER JOIN threads ON thread_id = threads.id" " INNER JOIN threads ON thread_id = threads.id"
" WHERE comm_id = " + str(self.dbid)) " WHERE comm_id = " + str(self.dbid))
while query.next(): while query.next():
child_item = CallGraphLevelTwoItem(self.glb, self.child_count, self.dbid, query.value(0), query.value(1), query.value(2), self) child_item = CallGraphLevelTwoItem(self.glb, self.params, self.child_count, self.dbid, query.value(0), query.value(1), query.value(2), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
@@ -582,8 +584,8 @@ class CallGraphLevelOneItem(CallGraphLevelItemBase):
class CallGraphRootItem(CallGraphLevelItemBase): class CallGraphRootItem(CallGraphLevelItemBase):
def __init__(self, glb): def __init__(self, glb, params):
super(CallGraphRootItem, self).__init__(glb, 0, None) super(CallGraphRootItem, self).__init__(glb, params, 0, None)
self.dbid = 0 self.dbid = 0
self.query_done = True; self.query_done = True;
query = QSqlQuery(glb.db) query = QSqlQuery(glb.db)
@@ -591,16 +593,23 @@ class CallGraphRootItem(CallGraphLevelItemBase):
while query.next(): while query.next():
if not query.value(0): if not query.value(0):
continue continue
child_item = CallGraphLevelOneItem(glb, self.child_count, query.value(0), query.value(1), self) child_item = CallGraphLevelOneItem(glb, params, self.child_count, query.value(0), query.value(1), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
# Call graph model parameters
class CallGraphModelParams():
def __init__(self, glb, parent=None):
self.have_ipc = IsSelectable(glb.db, "calls", columns = "insn_count, cyc_count")
# Context-sensitive call graph data model base # Context-sensitive call graph data model base
class CallGraphModelBase(TreeModel): class CallGraphModelBase(TreeModel):
def __init__(self, glb, parent=None): def __init__(self, glb, parent=None):
super(CallGraphModelBase, self).__init__(glb, parent) super(CallGraphModelBase, self).__init__(glb, CallGraphModelParams(glb), parent)
def FindSelect(self, value, pattern, query): def FindSelect(self, value, pattern, query):
if pattern: if pattern:
@@ -682,7 +691,7 @@ class CallGraphModel(CallGraphModelBase):
super(CallGraphModel, self).__init__(glb, parent) super(CallGraphModel, self).__init__(glb, parent)
def GetRoot(self): def GetRoot(self):
return CallGraphRootItem(self.glb) return CallGraphRootItem(self.glb, self.params)
def columnCount(self, parent=None): def columnCount(self, parent=None):
return 7 return 7
@@ -729,8 +738,8 @@ class CallGraphModel(CallGraphModelBase):
class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase): class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
def __init__(self, glb, row, comm_id, thread_id, calls_id, time, branch_count, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, calls_id, time, branch_count, parent_item):
super(CallTreeLevelTwoPlusItemBase, self).__init__(glb, row, parent_item) super(CallTreeLevelTwoPlusItemBase, self).__init__(glb, params, row, parent_item)
self.comm_id = comm_id self.comm_id = comm_id
self.thread_id = thread_id self.thread_id = thread_id
self.calls_id = calls_id self.calls_id = calls_id
@@ -752,7 +761,7 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
" WHERE calls.parent_id = " + str(self.calls_id) + comm_thread + " WHERE calls.parent_id = " + str(self.calls_id) + comm_thread +
" ORDER BY call_time, calls.id") " ORDER BY call_time, calls.id")
while query.next(): while query.next():
child_item = CallTreeLevelThreeItem(self.glb, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), int(query.value(5)), self) child_item = CallTreeLevelThreeItem(self.glb, self.params, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), int(query.value(5)), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
@@ -760,8 +769,8 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
class CallTreeLevelThreeItem(CallTreeLevelTwoPlusItemBase): class CallTreeLevelThreeItem(CallTreeLevelTwoPlusItemBase):
def __init__(self, glb, row, comm_id, thread_id, calls_id, name, dso, count, time, branch_count, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, calls_id, name, dso, count, time, branch_count, parent_item):
super(CallTreeLevelThreeItem, self).__init__(glb, row, comm_id, thread_id, calls_id, time, branch_count, parent_item) super(CallTreeLevelThreeItem, self).__init__(glb, params, row, comm_id, thread_id, calls_id, time, branch_count, parent_item)
dso = dsoname(dso) dso = dsoname(dso)
self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ] self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ]
self.dbid = calls_id self.dbid = calls_id
@@ -770,8 +779,8 @@ class CallTreeLevelThreeItem(CallTreeLevelTwoPlusItemBase):
class CallTreeLevelTwoItem(CallTreeLevelTwoPlusItemBase): class CallTreeLevelTwoItem(CallTreeLevelTwoPlusItemBase):
def __init__(self, glb, row, comm_id, thread_id, pid, tid, parent_item): def __init__(self, glb, params, row, comm_id, thread_id, pid, tid, parent_item):
super(CallTreeLevelTwoItem, self).__init__(glb, row, comm_id, thread_id, 0, 0, 0, parent_item) super(CallTreeLevelTwoItem, self).__init__(glb, params, row, comm_id, thread_id, 0, 0, 0, parent_item)
self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""] self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""]
self.dbid = thread_id self.dbid = thread_id
@@ -788,8 +797,8 @@ class CallTreeLevelTwoItem(CallTreeLevelTwoPlusItemBase):
class CallTreeLevelOneItem(CallGraphLevelItemBase): class CallTreeLevelOneItem(CallGraphLevelItemBase):
def __init__(self, glb, row, comm_id, comm, parent_item): def __init__(self, glb, params, row, comm_id, comm, parent_item):
super(CallTreeLevelOneItem, self).__init__(glb, row, parent_item) super(CallTreeLevelOneItem, self).__init__(glb, params, row, parent_item)
self.data = [comm, "", "", "", "", "", ""] self.data = [comm, "", "", "", "", "", ""]
self.dbid = comm_id self.dbid = comm_id
@@ -801,7 +810,7 @@ class CallTreeLevelOneItem(CallGraphLevelItemBase):
" INNER JOIN threads ON thread_id = threads.id" " INNER JOIN threads ON thread_id = threads.id"
" WHERE comm_id = " + str(self.dbid)) " WHERE comm_id = " + str(self.dbid))
while query.next(): while query.next():
child_item = CallTreeLevelTwoItem(self.glb, self.child_count, self.dbid, query.value(0), query.value(1), query.value(2), self) child_item = CallTreeLevelTwoItem(self.glb, self.params, self.child_count, self.dbid, query.value(0), query.value(1), query.value(2), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
@@ -809,8 +818,8 @@ class CallTreeLevelOneItem(CallGraphLevelItemBase):
class CallTreeRootItem(CallGraphLevelItemBase): class CallTreeRootItem(CallGraphLevelItemBase):
def __init__(self, glb): def __init__(self, glb, params):
super(CallTreeRootItem, self).__init__(glb, 0, None) super(CallTreeRootItem, self).__init__(glb, params, 0, None)
self.dbid = 0 self.dbid = 0
self.query_done = True; self.query_done = True;
query = QSqlQuery(glb.db) query = QSqlQuery(glb.db)
@@ -818,7 +827,7 @@ class CallTreeRootItem(CallGraphLevelItemBase):
while query.next(): while query.next():
if not query.value(0): if not query.value(0):
continue continue
child_item = CallTreeLevelOneItem(glb, self.child_count, query.value(0), query.value(1), self) child_item = CallTreeLevelOneItem(glb, params, self.child_count, query.value(0), query.value(1), self)
self.child_items.append(child_item) self.child_items.append(child_item)
self.child_count += 1 self.child_count += 1
@@ -830,7 +839,7 @@ class CallTreeModel(CallGraphModelBase):
super(CallTreeModel, self).__init__(glb, parent) super(CallTreeModel, self).__init__(glb, parent)
def GetRoot(self): def GetRoot(self):
return CallTreeRootItem(self.glb) return CallTreeRootItem(self.glb, self.params)
def columnCount(self, parent=None): def columnCount(self, parent=None):
return 7 return 7
@@ -1606,7 +1615,7 @@ class BranchModel(TreeModel):
progress = Signal(object) progress = Signal(object)
def __init__(self, glb, event_id, where_clause, parent=None): def __init__(self, glb, event_id, where_clause, parent=None):
super(BranchModel, self).__init__(glb, parent) super(BranchModel, self).__init__(glb, None, parent)
self.event_id = event_id self.event_id = event_id
self.more = True self.more = True
self.populated = 0 self.populated = 0