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 06/19] perf scripts python: call-graph-from-sql.py: Separate the database details into a class
Date: Mon, 1 Oct 2018 09:28:40 +0300 [thread overview]
Message-ID: <20181001062853.28285-7-adrian.hunter@intel.com> (raw)
In-Reply-To: <20181001062853.28285-1-adrian.hunter@intel.com>
Separate the database details into a class that can provide different
connections using the same connection information. That paves the way for
sub-processes that require their own connection.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
.../scripts/python/call-graph-from-sql.py | 63 +++++++++++--------
1 file changed, 38 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 2b74b94eeccc..9d056deab2b1 100644
--- a/tools/perf/scripts/python/call-graph-from-sql.py
+++ b/tools/perf/scripts/python/call-graph-from-sql.py
@@ -284,6 +284,42 @@ class MainWindow(QMainWindow):
self.setCentralWidget(self.view)
+# Database reference
+
+class DBRef():
+
+ def __init__(self, is_sqlite3, dbname):
+ self.is_sqlite3 = is_sqlite3
+ self.dbname = dbname
+
+ def Open(self, connection_name):
+ dbname = self.dbname
+ if self.is_sqlite3:
+ db = QSqlDatabase.addDatabase("QSQLITE", connection_name)
+ else:
+ db = QSqlDatabase.addDatabase("QPSQL", connection_name)
+ opts = dbname.split()
+ for opt in opts:
+ if "=" in opt:
+ opt = opt.split("=")
+ if opt[0] == "hostname":
+ db.setHostName(opt[1])
+ elif opt[0] == "port":
+ db.setPort(int(opt[1]))
+ elif opt[0] == "username":
+ db.setUserName(opt[1])
+ elif opt[0] == "password":
+ db.setPassword(opt[1])
+ elif opt[0] == "dbname":
+ dbname = opt[1]
+ else:
+ dbname = opt
+
+ db.setDatabaseName(dbname)
+ if not db.open():
+ raise Exception("Failed to open database " + dbname + " error: " + db.lastError().text())
+ return db, dbname
+
# Main
def Main():
@@ -302,31 +338,8 @@ def Main():
except:
pass
- if is_sqlite3:
- db = QSqlDatabase.addDatabase('QSQLITE')
- else:
- db = QSqlDatabase.addDatabase('QPSQL')
- opts = dbname.split()
- for opt in opts:
- if '=' in opt:
- opt = opt.split('=')
- if opt[0] == 'hostname':
- db.setHostName(opt[1])
- elif opt[0] == 'port':
- db.setPort(int(opt[1]))
- elif opt[0] == 'username':
- db.setUserName(opt[1])
- elif opt[0] == 'password':
- db.setPassword(opt[1])
- elif opt[0] == 'dbname':
- dbname = opt[1]
- else:
- dbname = opt
-
- db.setDatabaseName(dbname)
- if not db.open():
- raise Exception("Failed to open database " + dbname + " error: " + db.lastError().text())
-
+ dbref = DBRef(is_sqlite3, dbname)
+ db, dbname = dbref.Open("main")
app = QApplication(sys.argv)
window = MainWindow(db, dbname)
window.show()
--
2.17.1
next prev parent reply other threads:[~2018-10-01 6:35 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 ` Adrian Hunter [this message]
2018-10-26 7:38 ` [tip:perf/urgent] perf scripts python: call-graph-from-sql.py: Separate the database details into a class 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: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-7-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).