From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Tony Jones <tonyj@suse.de>,
Adrian Hunter <adrian.hunter@intel.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 18/30] perf script python: Add printdate function to SQL exporters
Date: Mon, 11 Mar 2019 23:01:52 -0300 [thread overview]
Message-ID: <20190312020204.22092-19-acme@kernel.org> (raw)
In-Reply-To: <20190312020204.22092-1-acme@kernel.org>
From: Tony Jones <tonyj@suse.de>
Introduce a printdate function to eliminate the repetitive use of
datetime.datetime.today() in the SQL exporting scripts.
Signed-off-by: Tony Jones <tonyj@suse.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/r/20190309000518.2438-5-tonyj@suse.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
.../scripts/python/export-to-postgresql.py | 19 +++++++++++--------
tools/perf/scripts/python/export-to-sqlite.py | 13 ++++++++-----
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py
index 00ab972a2eba..c3eae1d77d36 100644
--- a/tools/perf/scripts/python/export-to-postgresql.py
+++ b/tools/perf/scripts/python/export-to-postgresql.py
@@ -251,6 +251,9 @@ perf_db_export_callchains = False
def printerr(*args, **kw_args):
print(*args, file=sys.stderr, **kw_args)
+def printdate(*args, **kw_args):
+ print(datetime.datetime.today(), *args, sep=' ', **kw_args)
+
def usage():
printerr("Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]")
printerr("where: columns 'all' or 'branches'")
@@ -289,7 +292,7 @@ def do_query(q, s):
return
raise Exception("Query failed: " + q.lastError().text())
-print(datetime.datetime.today(), "Creating database...")
+printdate("Creating database...")
db = QSqlDatabase.addDatabase('QPSQL')
query = QSqlQuery(db)
@@ -582,7 +585,7 @@ if perf_db_export_calls:
call_file = open_output_file("call_table.bin")
def trace_begin():
- print(datetime.datetime.today(), "Writing to intermediate files...")
+ printdate("Writing to intermediate files...")
# id == 0 means unknown. It is easier to create records for them than replace the zeroes with NULLs
evsel_table(0, "unknown")
machine_table(0, 0, "unknown")
@@ -598,7 +601,7 @@ def trace_begin():
unhandled_count = 0
def trace_end():
- print(datetime.datetime.today(), "Copying to database...")
+ printdate("Copying to database...")
copy_output_file(evsel_file, "selected_events")
copy_output_file(machine_file, "machines")
copy_output_file(thread_file, "threads")
@@ -613,7 +616,7 @@ def trace_end():
if perf_db_export_calls:
copy_output_file(call_file, "calls")
- print(datetime.datetime.today(), "Removing intermediate files...")
+ printdate("Removing intermediate files...")
remove_output_file(evsel_file)
remove_output_file(machine_file)
remove_output_file(thread_file)
@@ -628,7 +631,7 @@ def trace_end():
if perf_db_export_calls:
remove_output_file(call_file)
os.rmdir(output_dir_name)
- print(datetime.datetime.today(), "Adding primary keys")
+ printdate("Adding primary keys")
do_query(query, 'ALTER TABLE selected_events ADD PRIMARY KEY (id)')
do_query(query, 'ALTER TABLE machines ADD PRIMARY KEY (id)')
do_query(query, 'ALTER TABLE threads ADD PRIMARY KEY (id)')
@@ -643,7 +646,7 @@ def trace_end():
if perf_db_export_calls:
do_query(query, 'ALTER TABLE calls ADD PRIMARY KEY (id)')
- print(datetime.datetime.today(), "Adding foreign keys")
+ printdate("Adding foreign keys")
do_query(query, 'ALTER TABLE threads '
'ADD CONSTRAINT machinefk FOREIGN KEY (machine_id) REFERENCES machines (id),'
'ADD CONSTRAINT processfk FOREIGN KEY (process_id) REFERENCES threads (id)')
@@ -679,8 +682,8 @@ def trace_end():
do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')
if (unhandled_count):
- print(datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events")
- print(datetime.datetime.today(), "Done")
+ printdate("Warning: ", unhandled_count, " unhandled events")
+ printdate("Done")
def trace_unhandled(event_name, context, event_fields_dict):
global unhandled_count
diff --git a/tools/perf/scripts/python/export-to-sqlite.py b/tools/perf/scripts/python/export-to-sqlite.py
index 3da338243aed..3b71902a5a21 100644
--- a/tools/perf/scripts/python/export-to-sqlite.py
+++ b/tools/perf/scripts/python/export-to-sqlite.py
@@ -65,6 +65,9 @@ perf_db_export_callchains = False
def printerr(*args, **keyword_args):
print(*args, file=sys.stderr, **keyword_args)
+def printdate(*args, **kw_args):
+ print(datetime.datetime.today(), *args, sep=' ', **kw_args)
+
def usage():
printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>]");
printerr("where: columns 'all' or 'branches'");
@@ -105,7 +108,7 @@ def do_query_(q):
return
raise Exception("Query failed: " + q.lastError().text())
-print(datetime.datetime.today(), "Creating database ...")
+printdate("Creating database ...")
db_exists = False
try:
@@ -383,7 +386,7 @@ if perf_db_export_calls:
call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
def trace_begin():
- print(datetime.datetime.today(), "Writing records...")
+ printdate("Writing records...")
do_query(query, 'BEGIN TRANSACTION')
# id == 0 means unknown. It is easier to create records for them than replace the zeroes with NULLs
evsel_table(0, "unknown")
@@ -402,14 +405,14 @@ unhandled_count = 0
def trace_end():
do_query(query, 'END TRANSACTION')
- print(datetime.datetime.today(), "Adding indexes")
+ printdate("Adding indexes")
if perf_db_export_calls:
do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)')
do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')
if (unhandled_count):
- print(datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events")
- print(datetime.datetime.today(), "Done")
+ printdate("Warning: ", unhandled_count, " unhandled events")
+ printdate("Done")
def trace_unhandled(event_name, context, event_fields_dict):
global unhandled_count
--
2.20.1
next prev parent reply other threads:[~2019-03-12 2:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 2:01 [GIT PULL 00/30] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 01/30] perf/core: Restore mmap record type correctly Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 02/30] perf script: Support insn output for normal samples Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 03/30] perf report: Support output in nanoseconds Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 04/30] perf time-utils: Add utility function to print time stamps " Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 05/30] perf report: Parse time quantum Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 06/30] perf probe: Fix getting the kernel map Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 07/30] perf vendor events amd: perf PMU events for AMD Family 17h Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 08/30] perf data: Support having perf.data stored as a directory Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 09/30] perf data: Don't store auxtrace index for directory data file Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 10/30] perf data: Add perf_data__update_dir() function Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 11/30] perf data: Make perf_data__size() work over directory Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 12/30] perf header: Add DIR_FORMAT feature to describe directory data Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 13/30] perf session: Add process callback to reader object Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 14/30] perf report: Use less for scripts output Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 15/30] perf script python: Add Python3 support to exported-sql-viewer.py Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 16/30] perf script python: Add Python3 support to export-to-postgresql.py Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 17/30] perf script python: Add Python3 support to export-to-sqlite.py Arnaldo Carvalho de Melo
2019-03-12 2:01 ` Arnaldo Carvalho de Melo [this message]
2019-03-12 2:01 ` [PATCH 19/30] perf tools: Update x86's syscall_64.tbl, no change in tools/perf behaviour Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 20/30] tools headers uapi: Sync copy of asm-generic/unistd.h with the kernel sources Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 21/30] tools headers uapi: Update linux/in.h copy Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 22/30] perf script: Filter COMM/FORK/.. events by CPU Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 23/30] perf report: Support time sort key Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 24/30] perf report: Support running scripts for current time range Arnaldo Carvalho de Melo
2019-03-12 2:01 ` [PATCH 25/30] perf report: Support builtin perf script in scripts menu Arnaldo Carvalho de Melo
2019-03-12 2:02 ` [PATCH 26/30] perf report: Implement browsing of individual samples Arnaldo Carvalho de Melo
2019-03-12 2:02 ` [PATCH 27/30] perf tools: Add some new tips describing the new options Arnaldo Carvalho de Melo
2019-03-12 2:02 ` [PATCH 28/30] perf script: Add array bound checking to list_scripts Arnaldo Carvalho de Melo
2019-03-12 2:02 ` [PATCH 29/30] perf ui browser: Fix ui popup argv browser for many entries Arnaldo Carvalho de Melo
2019-03-12 2:02 ` [PATCH 30/30] perf tools report: Add custom scripts to script menu Arnaldo Carvalho de Melo
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=20190312020204.22092-19-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tonyj@suse.de \
--cc=williams@redhat.com \
/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).