Skip to contentSkip to conversation

perf scripts python: exported-sql-viewer.py: Improve TreeModel abstraction

tip:perf/urgent tip-bot for Adrian Hunter 1 participant 1 message Mar 9, 2019 perf events

lore
Share & tools
lore

tip-bot for Adrian Hunter

author merge bot
#0 lore raw
Commit-ID:  a448ba232a5f0176c226df1bab8877ec06a7c771
Gitweb:     https://git.kernel.org/tip/a448ba232a5f0176c226df1bab8877ec06a7c771
Author:     Adrian Hunter <[email protected]>
AuthorDate: Thu, 28 Feb 2019 15:00:29 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 1 Mar 2019 14:55:32 -0300

perf scripts python: exported-sql-viewer.py: Improve TreeModel abstraction

Instead of passing the tree root, get it from a method that can be implemented in any derived class.

---
 tools/perf/scripts/python/exported-sql-viewer.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
tools/perf/scripts/python/exported-sql-viewer.py +11 -6
index df854f0a69f0..b2a22525549d 100755
@@ -167,9 +167,10 @@ class Thread(QThread):
 
 class TreeModel(QAbstractItemModel):
 
-	def __init__(self, root, parent=None):
+	def __init__(self, glb, parent=None):
 		super(TreeModel, self).__init__(parent)
-		self.root = root
+		self.glb = glb
+		self.root = self.GetRoot()
 		self.last_row_read = 0
 
 	def Item(self, parent):
@@ -562,8 +563,10 @@ class CallGraphRootItem(CallGraphLevelItemBase):
 class CallGraphModel(TreeModel):
 
 	def __init__(self, glb, parent=None):
-		super(CallGraphModel, self).__init__(CallGraphRootItem(glb), parent)
-		self.glb = glb
+		super(CallGraphModel, self).__init__(glb, parent)
+
+	def GetRoot(self):
+		return CallGraphRootItem(self.glb)
 
 	def columnCount(self, parent=None):
 		return 7
@@ -1339,8 +1342,7 @@ class BranchModel(TreeModel):
 	progress = Signal(object)
 
 	def __init__(self, glb, event_id, where_clause, parent=None):
-		super(BranchModel, self).__init__(BranchRootItem(), parent)
-		self.glb = glb
+		super(BranchModel, self).__init__(glb, parent)
 		self.event_id = event_id
 		self.more = True
 		self.populated = 0
@@ -1364,6 +1366,9 @@ class BranchModel(TreeModel):
 		self.fetcher.done.connect(self.Update)
 		self.fetcher.Fetch(glb_chunk_sz)
 
+	def GetRoot(self):
+		return BranchRootItem()
+
 	def columnCount(self, parent=None):
 		return 8