Commit 8ce9a725 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf scripts python: export-to-sqlite.py: Export calls parent_id

Export to the 'calls' table the newly created 'parent_id'.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lkml.kernel.org/n/tip-b09oukl48rsl9azkp2wmh0bl@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f435887e
...@@ -222,7 +222,8 @@ if perf_db_export_calls: ...@@ -222,7 +222,8 @@ if perf_db_export_calls:
'call_id bigint,' 'call_id bigint,'
'return_id bigint,' 'return_id bigint,'
'parent_call_path_id bigint,' 'parent_call_path_id bigint,'
'flags integer)') 'flags integer,'
'parent_id bigint)')
# printf was added to sqlite in version 3.8.3 # printf was added to sqlite in version 3.8.3
sqlite_has_printf = False sqlite_has_printf = False
...@@ -321,7 +322,8 @@ if perf_db_export_calls: ...@@ -321,7 +322,8 @@ if perf_db_export_calls:
'call_id,' 'call_id,'
'return_id,' 'return_id,'
'CASE WHEN flags=0 THEN \'\' WHEN flags=1 THEN \'no call\' WHEN flags=2 THEN \'no return\' WHEN flags=3 THEN \'no call/return\' WHEN flags=6 THEN \'jump\' ELSE flags END AS flags,' 'CASE WHEN flags=0 THEN \'\' WHEN flags=1 THEN \'no call\' WHEN flags=2 THEN \'no return\' WHEN flags=3 THEN \'no call/return\' WHEN flags=6 THEN \'jump\' ELSE flags END AS flags,'
'parent_call_path_id' 'parent_call_path_id,'
'parent_id'
' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id') ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id')
do_query(query, 'CREATE VIEW samples_view AS ' do_query(query, 'CREATE VIEW samples_view AS '
...@@ -373,7 +375,7 @@ if perf_db_export_calls or perf_db_export_callchains: ...@@ -373,7 +375,7 @@ if perf_db_export_calls or perf_db_export_callchains:
call_path_query.prepare("INSERT INTO call_paths VALUES (?, ?, ?, ?)") call_path_query.prepare("INSERT INTO call_paths VALUES (?, ?, ?, ?)")
if perf_db_export_calls: if perf_db_export_calls:
call_query = QSqlQuery(db) call_query = QSqlQuery(db)
call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
def trace_begin(): def trace_begin():
print datetime.datetime.today(), "Writing records..." print datetime.datetime.today(), "Writing records..."
...@@ -388,6 +390,7 @@ def trace_begin(): ...@@ -388,6 +390,7 @@ def trace_begin():
sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
if perf_db_export_calls or perf_db_export_callchains: if perf_db_export_calls or perf_db_export_callchains:
call_path_table(0, 0, 0, 0) call_path_table(0, 0, 0, 0)
call_return_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
unhandled_count = 0 unhandled_count = 0
...@@ -397,6 +400,7 @@ def trace_end(): ...@@ -397,6 +400,7 @@ def trace_end():
print datetime.datetime.today(), "Adding indexes" print datetime.datetime.today(), "Adding indexes"
if perf_db_export_calls: if perf_db_export_calls:
do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)') 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): if (unhandled_count):
print datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events" print datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events"
...@@ -452,4 +456,4 @@ def call_path_table(*x): ...@@ -452,4 +456,4 @@ def call_path_table(*x):
bind_exec(call_path_query, 4, x) bind_exec(call_path_query, 4, x)
def call_return_table(*x): def call_return_table(*x):
bind_exec(call_query, 11, x) bind_exec(call_query, 12, x)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment