From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com,
tglx@linutronix.de, adrian.hunter@intel.com, ak@linux.intel.com,
mingo@kernel.org, jolsa@redhat.com
Subject: [tip:perf/urgent] perf scripts python: call-graph-from-sql.py: Add data helper functions
Date: Fri, 26 Oct 2018 00:41:04 -0700 [thread overview]
Message-ID: <tip-4be9ace7e1cdcb44c1fba1fb41ec2b92dda06732@git.kernel.org> (raw)
In-Reply-To: <20181001062853.28285-11-adrian.hunter@intel.com>
Commit-ID: 4be9ace7e1cdcb44c1fba1fb41ec2b92dda06732
Gitweb: https://git.kernel.org/tip/4be9ace7e1cdcb44c1fba1fb41ec2b92dda06732
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Mon, 1 Oct 2018 09:28:44 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 23 Oct 2018 14:25:42 -0300
perf scripts python: call-graph-from-sql.py: Add data helper functions
Add helper functions for a few common cases.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20181001062853.28285-11-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/scripts/python/call-graph-from-sql.py | 54 +++++++++++++-----------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/tools/perf/scripts/python/call-graph-from-sql.py b/tools/perf/scripts/python/call-graph-from-sql.py
index ada486048ad8..7f2eabe7dacd 100644
--- a/tools/perf/scripts/python/call-graph-from-sql.py
+++ b/tools/perf/scripts/python/call-graph-from-sql.py
@@ -52,6 +52,28 @@ from PySide.QtGui import *
from PySide.QtSql import *
from decimal import *
+# Data formatting helpers
+
+def dsoname(name):
+ if name == "[kernel.kallsyms]":
+ return "[kernel]"
+ return name
+
+# Percent to one decimal place
+
+def PercentToOneDP(n, d):
+ if not d:
+ return "0.0"
+ x = (n * Decimal(100)) / d
+ return str(x.quantize(Decimal(".1"), rounding=ROUND_HALF_UP))
+
+# Helper for queries that must not fail
+
+def QueryExec(query, stmt):
+ ret = query.exec_(stmt)
+ if not ret:
+ raise Exception("Query failed: " + query.lastError().text())
+
class TreeItem():
def __init__(self, db, row, parent_item):
@@ -73,9 +95,7 @@ class TreeItem():
def setUpRoot(self):
self.query_done = True
query = QSqlQuery(self.db)
- ret = query.exec_('SELECT id, comm FROM comms')
- if not ret:
- raise Exception("Query failed: " + query.lastError().text())
+ QueryExec(query, 'SELECT id, comm FROM comms')
while query.next():
if not query.value(0):
continue
@@ -91,9 +111,7 @@ class TreeItem():
self.child_items = []
self.child_count = 0
query = QSqlQuery(self.db)
- ret = query.exec_('SELECT thread_id, ( SELECT pid FROM threads WHERE id = thread_id ), ( SELECT tid FROM threads WHERE id = thread_id ) FROM comm_threads WHERE comm_id = ' + str(comm_id))
- if not ret:
- raise Exception("Query failed: " + query.lastError().text())
+ QueryExec(query, 'SELECT thread_id, ( SELECT pid FROM threads WHERE id = thread_id ), ( SELECT tid FROM threads WHERE id = thread_id ) FROM comm_threads WHERE comm_id = ' + str(comm_id))
while query.next():
child_item = TreeItem(self.db, self.child_count, self)
self.child_items.append(child_item)
@@ -114,18 +132,6 @@ class TreeItem():
def getRow(self):
return self.row
- def timePercent(self, b):
- if not self.time:
- return "0.0"
- x = (b * Decimal(100)) / self.time
- return str(x.quantize(Decimal('.1'), rounding=ROUND_HALF_UP))
-
- def branchPercent(self, b):
- if not self.branch_count:
- return "0.0"
- x = (b * Decimal(100)) / self.branch_count
- return str(x.quantize(Decimal('.1'), rounding=ROUND_HALF_UP))
-
def addChild(self, call_path_id, name, dso, count, time, branch_count):
child_item = TreeItem(self.db, self.child_count, self)
child_item.comm_id = self.comm_id
@@ -134,14 +140,12 @@ class TreeItem():
child_item.branch_count = branch_count
child_item.time = time
child_item.data[0] = name
- if dso == "[kernel.kallsyms]":
- dso = "[kernel]"
- child_item.data[1] = dso
+ child_item.data[1] = dsoname(dso)
child_item.data[2] = str(count)
child_item.data[3] = str(time)
- child_item.data[4] = self.timePercent(time)
+ child_item.data[4] = PercentToOneDP(time, self.time)
child_item.data[5] = str(branch_count)
- child_item.data[6] = self.branchPercent(branch_count)
+ child_item.data[6] = PercentToOneDP(branch_count, self.branch_count)
self.child_items.append(child_item)
self.child_count += 1
@@ -189,12 +193,12 @@ class TreeItem():
self.branch_count = total_branch_count
if self.branch_count:
for child_item in self.child_items:
- child_item.data[6] = self.branchPercent(child_item.branch_count)
+ child_item.data[6] = PercentToOneDP(child_item.branch_count, self.branch_count)
if total_time > self.time:
self.time = total_time
if self.time:
for child_item in self.child_items:
- child_item.data[4] = self.timePercent(child_item.time)
+ child_item.data[4] = PercentToOneDP(child_item.time, self.time)
def childCount(self):
if not self.query_done:
next prev parent reply other threads:[~2018-10-26 7:41 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 ` [PATCH 09/19] perf scripts python: call-graph-from-sql.py: Factor out CallGraphModel from TreeModel Adrian Hunter
2018-10-26 7:40 ` [tip:perf/urgent] " 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-bot for Adrian Hunter [this message]
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=tip-4be9ace7e1cdcb44c1fba1fb41ec2b92dda06732@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).