History

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

Export to the 'calls' table the newly created 'parent_id' and create an index for it.

Adrian Hunter committed 7 years ago

Commit febce6d1 parent 07c5ebe1 file · +9 −5Browse files

Showing the changes to tools/perf/scripts/python (1 of 1 file). Show all

Unified · Split

tools/perf/scripts/python/export-to-postgresql.py+9−5
@@ -394,7 +394,8 @@ if perf_db_export_calls: · 393 unmodified lines
394394 'call_id bigint,'
395395 'return_id bigint,'
396396 'parent_call_path_id bigint,'
397− 'flags integer)')
397+ 'flags integer,'
398+ 'parent_id bigint)')
398399
399400 do_query(query, 'CREATE VIEW machines_view AS '
400401 'SELECT '
@@ -479,7 +480,8 @@ if perf_db_export_calls: · 78 unmodified lines
479480 'call_id,'
480481 'return_id,'
481482 '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 CAST ( flags AS VARCHAR(6) ) END AS flags,'
482− 'parent_call_path_id'
483+ 'parent_call_path_id,'
484+ 'calls.parent_id'
483485 ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id')
484486
485487 do_query(query, 'CREATE VIEW samples_view AS '
@@ -575,6 +577,7 @@ def trace_begin(): · 89 unmodified lines
575577 sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
576578 if perf_db_export_calls or perf_db_export_callchains:
577579 call_path_table(0, 0, 0, 0)
580+ call_return_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
578581
579582 unhandled_count = 0
580583
@@ -657,6 +660,7 @@ def trace_end(): · 76 unmodified lines
657660 'ADD CONSTRAINT returnfk FOREIGN KEY (return_id) REFERENCES samples (id),'
658661 'ADD CONSTRAINT parent_call_pathfk FOREIGN KEY (parent_call_path_id) REFERENCES call_paths (id)')
659662 do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)')
663+ do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')
660664
661665 if (unhandled_count):
662666 print datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events"
@@ -728,7 +732,7 @@ def call_path_table(cp_id, parent_id, symbol_id, ip, *x): · 65 unmodified lines
728732 value = struct.pack(fmt, 4, 8, cp_id, 8, parent_id, 8, symbol_id, 8, ip)
729733 call_path_file.write(value)
730734
731−def call_return_table(cr_id, thread_id, comm_id, call_path_id, call_time, return_time, branch_count, call_id, return_id, parent_call_path_id, flags, *x):
732− fmt = "!hiqiqiqiqiqiqiqiqiqiqii"
733− value = struct.pack(fmt, 11, 8, cr_id, 8, thread_id, 8, comm_id, 8, call_path_id, 8, call_time, 8, return_time, 8, branch_count, 8, call_id, 8, return_id, 8, parent_call_path_id, 4, flags)
735+def call_return_table(cr_id, thread_id, comm_id, call_path_id, call_time, return_time, branch_count, call_id, return_id, parent_call_path_id, flags, parent_id, *x):
736+ fmt = "!hiqiqiqiqiqiqiqiqiqiqiiiq"
737+ value = struct.pack(fmt, 12, 8, cr_id, 8, thread_id, 8, comm_id, 8, call_path_id, 8, call_time, 8, return_time, 8, branch_count, 8, call_id, 8, return_id, 8, parent_call_path_id, 4, flags, 8, parent_id)
734738 call_file.write(value)