[tip:perf/urgent] perf db-export: Export comm before exporting thread
From: tip-bot for Adrian Hunter
Date: Wed Jul 17 2019 - 18:54:19 EST
Commit-ID: 6319790bcf825bcc4cd9bf01f01ae404a2fb7da8
Gitweb: https://git.kernel.org/tip/6319790bcf825bcc4cd9bf01f01ae404a2fb7da8
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
AuthorDate: Wed, 10 Jul 2019 11:57:54 +0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 10 Jul 2019 12:12:25 -0300
perf db-export: Export comm before exporting thread
Export comm before exporting the non-main thread because
db_export__thread() also exports the comm_thread.
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/20190710085810.1650-6-adrian.hunter@xxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/db-export.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 63f9edf65eee..99ad759561de 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -312,6 +312,12 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
main_thread);
if (err)
goto out_put;
+ if (comm) {
+ err = db_export__exec_comm(dbe, comm, main_thread);
+ if (err)
+ goto out_put;
+ es.comm_db_id = comm->db_id;
+ }
}
if (thread != main_thread) {
@@ -321,13 +327,6 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
goto out_put;
}
- if (comm) {
- err = db_export__exec_comm(dbe, comm, main_thread);
- if (err)
- goto out_put;
- es.comm_db_id = comm->db_id;
- }
-
es.db_id = ++dbe->sample_last_db_id;
err = db_ids_from_al(dbe, al, &es.dso_db_id, &es.sym_db_id, &es.offset);