From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Andi Kleen <ak@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/19] perf scripts python: call-graph-from-sql.py: Factor out CallGraphModel from TreeModel
Date: Mon, 1 Oct 2018 09:28:43 +0300 [thread overview]
Message-ID: <20181001062853.28285-10-adrian.hunter@intel.com> (raw)
In-Reply-To: <20181001062853.28285-1-adrian.hunter@intel.com>
Factor out CallGraphModel from TreeModel, which paves the way to reuse
TreeModel in future reports.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
.../scripts/python/call-graph-from-sql.py | 90 +++++++++++++------
1 file changed, 61 insertions(+), 29 deletions(-)
diff --git a/tools/perf/scripts/python/call-graph-from-sql.py b/tools/perf/scripts/python/call-graph-from-sql.py
index 65c18e351bc4..ada486048ad8 100644
--- a/tools/perf/scripts/python/call-graph-from-sql.py
+++ b/tools/perf/scripts/python/call-graph-from-sql.py
@@ -201,42 +201,47 @@ class TreeItem():
self.selectCalls()
return self.child_count
- def columnCount(self):
- return 7
-
- def columnHeader(self, column):
- headers = ["Call Path", "Object", "Count ", "Time (ns) ", "Time (%) ", "Branch Count ", "Branch Count (%) "]
- return headers[column]
+ def hasChildren(self):
+ if not self.query_done:
+ return True
+ return self.child_count > 0
def getData(self, column):
return self.data[column]
+# Tree data model
+
class TreeModel(QAbstractItemModel):
- def __init__(self, db, parent=None):
+ def __init__(self, root, parent=None):
super(TreeModel, self).__init__(parent)
- self.db = db
- self.root = TreeItem(db, 0, None)
+ self.root = root
+ self.last_row_read = 0
- def columnCount(self, parent):
- return self.root.columnCount()
-
- def rowCount(self, parent):
+ def Item(self, parent):
if parent.isValid():
- parent_item = parent.internalPointer()
+ return parent.internalPointer()
else:
- parent_item = self.root
- return parent_item.childCount()
+ return self.root
+
+ def rowCount(self, parent):
+ result = self.Item(parent).childCount()
+ if result < 0:
+ result = 0
+ self.dataChanged.emit(parent, parent)
+ return result
+
+ def hasChildren(self, parent):
+ return self.Item(parent).hasChildren()
def headerData(self, section, orientation, role):
if role == Qt.TextAlignmentRole:
- if section > 1:
- return Qt.AlignRight
+ return self.columnAlignment(section)
if role != Qt.DisplayRole:
return None
if orientation != Qt.Horizontal:
return None
- return self.root.columnHeader(section)
+ return self.columnHeader(section)
def parent(self, child):
child_item = child.internalPointer()
@@ -246,21 +251,48 @@ class TreeModel(QAbstractItemModel):
return self.createIndex(parent_item.getRow(), 0, parent_item)
def index(self, row, column, parent):
- if parent.isValid():
- parent_item = parent.internalPointer()
- else:
- parent_item = self.root
- child_item = parent_item.getChildItem(row)
+ child_item = self.Item(parent).getChildItem(row)
return self.createIndex(row, column, child_item)
+ def DisplayData(self, item, index):
+ return item.getData(index.column())
+
+ def columnAlignment(self, column):
+ return Qt.AlignLeft
+
+ def columnFont(self, column):
+ return None
+
def data(self, index, role):
if role == Qt.TextAlignmentRole:
- if index.column() > 1:
- return Qt.AlignRight
+ return self.columnAlignment(index.column())
+ if role == Qt.FontRole:
+ return self.columnFont(index.column())
if role != Qt.DisplayRole:
return None
- index_item = index.internalPointer()
- return index_item.getData(index.column())
+ item = index.internalPointer()
+ return self.DisplayData(item, index)
+
+# Context-sensitive call graph data model
+
+class CallGraphModel(TreeModel):
+
+ def __init__(self, glb, parent=None):
+ super(CallGraphModel, self).__init__(TreeItem(glb.db, 0, None), parent)
+ self.glb = glb
+
+ def columnCount(self, parent=None):
+ return 7
+
+ def columnHeader(self, column):
+ headers = ["Call Path", "Object", "Count ", "Time (ns) ", "Time (%) ", "Branch Count ", "Branch Count (%) "]
+ return headers[column]
+
+ def columnAlignment(self, column):
+ alignment = [ Qt.AlignLeft, Qt.AlignLeft, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight ]
+ return alignment[column]
+
+# Main window
class MainWindow(QMainWindow):
@@ -275,7 +307,7 @@ class MainWindow(QMainWindow):
self.setWindowIcon(self.style().standardIcon(QStyle.SP_ComputerIcon))
self.setMinimumSize(200, 100)
- self.model = TreeModel(glb.db)
+ self.model = CallGraphModel(glb)
self.view = QTreeView()
self.view.setModel(self.model)
--
2.17.1
next prev parent reply other threads:[~2018-10-01 6:36 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 6:28 [PATCH 00/19] perf scripts python: call-graph-from-sql.py / exported-sql-viewer.py disassembly Adrian Hunter
2018-10-01 6:28 ` [PATCH 01/19] perf scripts python: call-graph-from-sql.py: Use SPDX license identifier Adrian Hunter
2018-10-26 7:36 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 02/19] perf scripts python: call-graph-from-sql.py: Provide better default column sizes Adrian Hunter
2018-10-26 7:36 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 03/19] perf scripts python: call-graph-from-sql.py: Set a minimum window size Adrian Hunter
2018-10-26 7:37 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 04/19] perf scripts python: call-graph-from-sql.py: Change icon Adrian Hunter
2018-10-26 7:37 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 05/19] perf scripts python: call-graph-from-sql.py: Make a "Main" function Adrian Hunter
2018-10-26 7:38 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 06/19] perf scripts python: call-graph-from-sql.py: Separate the database details into a class Adrian Hunter
2018-10-26 7:38 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 07/19] perf scripts python: call-graph-from-sql.py: Add a class for global data Adrian Hunter
2018-10-26 7:39 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 08/19] perf scripts python: call-graph-from-sql.py: Remove use of setObjectName() Adrian Hunter
2018-10-26 7:39 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` Adrian Hunter [this message]
2018-10-26 7:40 ` [tip:perf/urgent] perf scripts python: call-graph-from-sql.py: Factor out CallGraphModel from TreeModel tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 10/19] perf scripts python: call-graph-from-sql.py: Add data helper functions Adrian Hunter
2018-10-26 7:41 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 11/19] perf scripts python: call-graph-from-sql.py: Refactor TreeItem class Adrian Hunter
2018-10-26 7:41 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 12/19] perf scripts python: call-graph-from-sql.py: Rename to exported-sql-viewer.py Adrian Hunter
2018-10-26 7:42 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 13/19] perf scripts python: exported-sql-viewer.py: Add support for multiple sub-windows Adrian Hunter
2018-10-26 7:42 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 14/19] perf scripts python: exported-sql-viewer.py: Add ability to find symbols in the call-graph Adrian Hunter
2018-10-26 7:43 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 15/19] perf scripts python: exported-sql-viewer.py: Add ability to shrink / enlarge font Adrian Hunter
2018-10-26 7:43 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 16/19] perf scripts python: exported-sql-viewer.py: Add ability to display all the database tables Adrian Hunter
2018-10-26 7:44 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 17/19] perf scripts python: exported-sql-viewer.py: Add All branches report Adrian Hunter
2018-10-22 18:50 ` Arnaldo Carvalho de Melo
2018-10-22 18:50 ` Arnaldo Carvalho de Melo
2018-10-23 8:20 ` Adrian Hunter
2018-10-23 7:59 ` [PATCH V2 " Adrian Hunter
2018-10-23 18:12 ` Arnaldo Carvalho de Melo
2018-10-23 18:41 ` Hunter, Adrian
2018-10-23 19:29 ` Arnaldo Carvalho de Melo
2018-10-23 19:57 ` Hunter, Adrian
2018-10-23 20:02 ` Arnaldo Carvalho de Melo
2018-10-23 20:31 ` Adrian Hunter
2018-10-24 13:56 ` Adrian Hunter
2018-10-24 14:16 ` Arnaldo Carvalho de Melo
2018-10-26 7:45 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2018-10-01 6:28 ` [PATCH 18/19] perf scripts python: exported-sql-viewer.py: Add Selected " Adrian Hunter
2018-10-01 6:28 ` [PATCH 19/19] perf scripts python: exported-sql-viewer.py: Add help window Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181001062853.28285-10-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).