From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@kernel.org, hpa@zytor.com, acme@redhat.com,
jolsa@redhat.com, adrian.hunter@intel.com
Subject: [tip:perf/urgent] perf db-export: Move export__comm_thread into db_export__sample()
Date: Wed, 17 Jul 2019 15:54:51 -0700 [thread overview]
Message-ID: <tip-1ed119589834e25c130fdaa911ca8b0e3fd1cddf@git.kernel.org> (raw)
In-Reply-To: <20190710085810.1650-7-adrian.hunter@intel.com>
Commit-ID: 1ed119589834e25c130fdaa911ca8b0e3fd1cddf
Gitweb: https://git.kernel.org/tip/1ed119589834e25c130fdaa911ca8b0e3fd1cddf
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Wed, 10 Jul 2019 11:57:55 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 10 Jul 2019 12:12:45 -0300
perf db-export: Move export__comm_thread into db_export__sample()
Move call to db_export__comm_thread() from db_export__thread() into
db_export__sample() because it makes the code easier to understand, and
add explanatory comments.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190710085810.1650-7-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/db-export.c | 35 +++++++++++++++++++++--------------
tools/perf/util/db-export.h | 3 +--
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 99ad759561de..78f62a733b9d 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -59,25 +59,17 @@ int db_export__machine(struct db_export *dbe, struct machine *machine)
}
int db_export__thread(struct db_export *dbe, struct thread *thread,
- struct machine *machine, struct comm *comm,
- struct thread *main_thread)
+ struct machine *machine, struct thread *main_thread)
{
u64 main_thread_db_id = 0;
- int err;
if (thread->db_id)
return 0;
thread->db_id = ++dbe->thread_last_db_id;
- if (main_thread) {
- if (main_thread != thread && comm) {
- err = db_export__comm_thread(dbe, comm, thread);
- if (err)
- return err;
- }
+ if (main_thread)
main_thread_db_id = main_thread->db_id;
- }
if (dbe->export_thread)
return dbe->export_thread(dbe, thread, main_thread_db_id,
@@ -303,15 +295,19 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
main_thread = thread__main_thread(al->machine, thread);
if (main_thread) {
- comm = machine__thread_exec_comm(al->machine, main_thread);
/*
* A thread has a reference to the main thread, so export the
* main thread first.
*/
- err = db_export__thread(dbe, main_thread, al->machine, comm,
+ err = db_export__thread(dbe, main_thread, al->machine,
main_thread);
if (err)
goto out_put;
+ /*
+ * Export comm before exporting the non-main thread because
+ * db_export__comm_thread() can be called further below.
+ */
+ comm = machine__thread_exec_comm(al->machine, main_thread);
if (comm) {
err = db_export__exec_comm(dbe, comm, main_thread);
if (err)
@@ -321,10 +317,21 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
}
if (thread != main_thread) {
- err = db_export__thread(dbe, thread, al->machine, comm,
- main_thread);
+ /*
+ * For a non-main thread, db_export__comm_thread() must be
+ * called only if thread has not previously been exported.
+ */
+ bool export_comm_thread = comm && !thread->db_id;
+
+ err = db_export__thread(dbe, thread, al->machine, main_thread);
if (err)
goto out_put;
+
+ if (export_comm_thread) {
+ err = db_export__comm_thread(dbe, comm, thread);
+ if (err)
+ goto out_put;
+ }
}
es.db_id = ++dbe->sample_last_db_id;
diff --git a/tools/perf/util/db-export.h b/tools/perf/util/db-export.h
index 6e267321594c..811a678a910d 100644
--- a/tools/perf/util/db-export.h
+++ b/tools/perf/util/db-export.h
@@ -75,8 +75,7 @@ void db_export__exit(struct db_export *dbe);
int db_export__evsel(struct db_export *dbe, struct perf_evsel *evsel);
int db_export__machine(struct db_export *dbe, struct machine *machine);
int db_export__thread(struct db_export *dbe, struct thread *thread,
- struct machine *machine, struct comm *comm,
- struct thread *main_thread);
+ struct machine *machine, struct thread *main_thread);
int db_export__exec_comm(struct db_export *dbe, struct comm *comm,
struct thread *main_thread);
int db_export__comm_thread(struct db_export *dbe, struct comm *comm,
next prev parent reply other threads:[~2019-07-17 22:55 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-10 8:57 [PATCH 00/21] perf db-export: Comm tidy-up and export switch events Adrian Hunter
2019-07-10 8:57 ` [PATCH 01/21] perf db-export: Get rid of db_export__deferred() Adrian Hunter
2019-07-17 22:51 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 02/21] perf db-export: Rename db_export__comm() to db_export__exec_comm() Adrian Hunter
2019-07-17 22:52 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 03/21] perf db-export: Pass main_thread to db_export__thread() Adrian Hunter
2019-07-17 22:52 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 04/21] perf db-export: Export main_thread in db_export__sample() Adrian Hunter
2019-07-17 22:53 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 05/21] perf db-export: Export comm before exporting thread Adrian Hunter
2019-07-17 22:54 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 06/21] perf db-export: Move export__comm_thread into db_export__sample() Adrian Hunter
2019-07-17 22:54 ` tip-bot for Adrian Hunter [this message]
2019-07-10 8:57 ` [PATCH 07/21] perf db-export: Fix a white space issue in db_export__sample() Adrian Hunter
2019-07-17 22:55 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 08/21] perf db-export: Export comm details Adrian Hunter
2019-07-17 22:56 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 09/21] perf scripts python: export-to-sqlite.py: " Adrian Hunter
2019-07-17 22:56 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:57 ` [PATCH 10/21] perf scripts python: export-to-postgresql.py: " Adrian Hunter
2019-07-17 22:57 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 11/21] perf db-export: Factor out db_export__comm() Adrian Hunter
2019-07-17 22:58 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 12/21] perf db-export: Also export thread's current comm Adrian Hunter
2019-07-17 22:59 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 13/21] perf scripts python: export-to-sqlite.py: Add has_calls column to comms table Adrian Hunter
2019-07-17 22:59 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 14/21] perf scripts python: export-to-postgresql.py: " Adrian Hunter
2019-07-17 23:00 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 15/21] perf scripts python: exported-sql-viewer.py: Remove redundant semi-colons Adrian Hunter
2019-07-17 23:01 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 16/21] perf scripts python: exported-sql-viewer.py: Use new 'has_calls' column Adrian Hunter
2019-07-17 23:01 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 17/21] perf script: Add scripting operation process_switch() Adrian Hunter
2019-07-17 23:02 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 18/21] perf db-export: Factor out db_export__threads() Adrian Hunter
2019-07-17 23:03 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 19/21] perf db-export: Export switch events Adrian Hunter
2019-07-17 23:04 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 20/21] perf scripts python: export-to-sqlite.py: " Adrian Hunter
2019-07-17 23:04 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2019-07-10 8:58 ` [PATCH 21/21] perf scripts python: export-to-postgresql.py: " Adrian Hunter
2019-07-17 23:05 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
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=tip-1ed119589834e25c130fdaa911ca8b0e3fd1cddf@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).