Export to the 'calls' table the newly created 'parent_id'.
Showing the changes to tools/perf/scripts/python (1 of 1 file). Show all
Unified · Split
| @@ -222,7 +222,8 @@ if perf_db_export_calls: · 221 unmodified lines | ||
| 222 | 222 | 'call_id bigint,' |
| 223 | 223 | 'return_id bigint,' |
| 224 | 224 | 'parent_call_path_id bigint,' |
| 225 | − 'flags integer)') | |
| 225 | + 'flags integer,' | |
| 226 | + 'parent_id bigint)') | |
| 226 | 227 | |
| 227 | 228 | # printf was added to sqlite in version 3.8.3 |
| 228 | 229 | sqlite_has_printf = False |
| @@ -321,7 +322,8 @@ if perf_db_export_calls: · 92 unmodified lines | ||
| 321 | 322 | 'call_id,' |
| 322 | 323 | 'return_id,' |
| 323 | 324 | '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,' |
| 324 | − 'parent_call_path_id' | |
| 325 | + 'parent_call_path_id,' | |
| 326 | + 'parent_id' | |
| 325 | 327 | ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id') |
| 326 | 328 | |
| 327 | 329 | do_query(query, 'CREATE VIEW samples_view AS ' |
| @@ -373,7 +375,7 @@ if perf_db_export_calls or perf_db_export_callchains: · 45 unmodified lines | ||
| 373 | 375 | call_path_query.prepare("INSERT INTO call_paths VALUES (?, ?, ?, ?)") |
| 374 | 376 | if perf_db_export_calls: |
| 375 | 377 | call_query = QSqlQuery(db) |
| 376 | − call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") | |
| 378 | + call_query.prepare("INSERT INTO calls VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") | |
| 377 | 379 | |
| 378 | 380 | def trace_begin(): |
| 379 | 381 | print datetime.datetime.today(), "Writing records..." |
| @@ -388,6 +390,7 @@ def trace_begin(): · 8 unmodified lines | ||
| 388 | 390 | sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) |
| 389 | 391 | if perf_db_export_calls or perf_db_export_callchains: |
| 390 | 392 | call_path_table(0, 0, 0, 0) |
| 393 | + call_return_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) | |
| 391 | 394 | |
| 392 | 395 | unhandled_count = 0 |
| 393 | 396 | |
| @@ -397,6 +400,7 @@ def trace_end(): · 3 unmodified lines | ||
| 397 | 400 | print datetime.datetime.today(), "Adding indexes" |
| 398 | 401 | if perf_db_export_calls: |
| 399 | 402 | do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)') |
| 403 | + do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)') | |
| 400 | 404 | |
| 401 | 405 | if (unhandled_count): |
| 402 | 406 | print datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events" |
| @@ -452,4 +456,4 @@ def call_path_table(*x): · 49 unmodified lines | ||
| 452 | 456 | bind_exec(call_path_query, 4, x) |
| 453 | 457 | |
| 454 | 458 | def call_return_table(*x): |
| 455 | − bind_exec(call_query, 11, x) | |
| 459 | + bind_exec(call_query, 12, x) | |