[tip:perf/core] perf db-export: Fix thread ref-counting
Commit-ID: 427cde3287f2c6349f308d0e22c9223f9ea05ef1
Gitweb: http://git.kernel.org/tip/427cde3287f2c6349f308d0e22c9223f9ea05ef1
Author: Adrian Hunter
AuthorDate: Fri, 29 May 2015 16:33:29 +0300
Committer: Arnaldo Carvalho de Melo
CommitDate: Fri, 29 May 2015 12:43:39 -0300
perf db-export: Fix thread ref-counting
Thread ref-counting was not done for get_main_thread() meaning that
there was a thread__get() from machine__find_thread() that was not being
paired with thread__put(). Fix that.
Signed-off-by: Adrian Hunter
Cc: Jiri Olsa
Link:
http://lkml.kernel.org/r/1432906425-9911-2-git-send-email-adrian.hun...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo
---
tools/perf/util/db-export.c | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index eb7a2ac..1c9689e 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -234,7 +234,7 @@ int db_export__symbol(struct db_export *dbe, struct symbol
*sym,
static struct thread *get_main_thread(struct machine *machine, struct thread
*thread)
{
if (thread->pid_ == thread->tid)
- return thread;
+ return thread__get(thread);
if (thread->pid_ == -1)
return NULL;
@@ -308,19 +308,18 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
if (err)
return err;
- /* FIXME: check refcounting for get_main_thread, that calls
machine__find_thread... */
main_thread = get_main_thread(al->machine, thread);
if (main_thread)
comm = machine__thread_exec_comm(al->machine, main_thread);
err = db_export__thread(dbe, thread, al->machine, comm);
if (err)
- return err;
+ goto out_put;
if (comm) {
err = db_export__comm(dbe, comm, main_thread);
if (err)
- return err;
+ goto out_put;
es.comm_db_id = comm->db_id;
}
@@ -328,7 +327,7 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
err = db_ids_from_al(dbe, al, _db_id, _db_id, );
if (err)
- return err;
+ goto out_put;
if ((evsel->attr.sample_type & PERF_SAMPLE_ADDR) &&
sample_addr_correlates_sym(>attr)) {
@@ -338,20 +337,22 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
err = db_ids_from_al(dbe, _al, _dso_db_id,
_sym_db_id, _offset);
if (err)
- return err;
+ goto out_put;
if (dbe->crp) {
err = thread_stack__process(thread, comm, sample, al,
_al, es.db_id,
dbe->crp);
if (err)
- return err;
+ goto out_put;
}
}
if (dbe->export_sample)
- return dbe->export_sample(dbe, );
+ err = dbe->export_sample(dbe, );
- return 0;
+out_put:
+ thread__put(main_thread);
+ return err;
}
static struct {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:perf/core] perf db-export: Fix thread ref-counting
Commit-ID: 427cde3287f2c6349f308d0e22c9223f9ea05ef1
Gitweb: http://git.kernel.org/tip/427cde3287f2c6349f308d0e22c9223f9ea05ef1
Author: Adrian Hunter adrian.hun...@intel.com
AuthorDate: Fri, 29 May 2015 16:33:29 +0300
Committer: Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Fri, 29 May 2015 12:43:39 -0300
perf db-export: Fix thread ref-counting
Thread ref-counting was not done for get_main_thread() meaning that
there was a thread__get() from machine__find_thread() that was not being
paired with thread__put(). Fix that.
Signed-off-by: Adrian Hunter adrian.hun...@intel.com
Cc: Jiri Olsa jo...@redhat.com
Link:
http://lkml.kernel.org/r/1432906425-9911-2-git-send-email-adrian.hun...@intel.com
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
tools/perf/util/db-export.c | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index eb7a2ac..1c9689e 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -234,7 +234,7 @@ int db_export__symbol(struct db_export *dbe, struct symbol
*sym,
static struct thread *get_main_thread(struct machine *machine, struct thread
*thread)
{
if (thread-pid_ == thread-tid)
- return thread;
+ return thread__get(thread);
if (thread-pid_ == -1)
return NULL;
@@ -308,19 +308,18 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
if (err)
return err;
- /* FIXME: check refcounting for get_main_thread, that calls
machine__find_thread... */
main_thread = get_main_thread(al-machine, thread);
if (main_thread)
comm = machine__thread_exec_comm(al-machine, main_thread);
err = db_export__thread(dbe, thread, al-machine, comm);
if (err)
- return err;
+ goto out_put;
if (comm) {
err = db_export__comm(dbe, comm, main_thread);
if (err)
- return err;
+ goto out_put;
es.comm_db_id = comm-db_id;
}
@@ -328,7 +327,7 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
err = db_ids_from_al(dbe, al, es.dso_db_id, es.sym_db_id, es.offset);
if (err)
- return err;
+ goto out_put;
if ((evsel-attr.sample_type PERF_SAMPLE_ADDR)
sample_addr_correlates_sym(evsel-attr)) {
@@ -338,20 +337,22 @@ int db_export__sample(struct db_export *dbe, union
perf_event *event,
err = db_ids_from_al(dbe, addr_al, es.addr_dso_db_id,
es.addr_sym_db_id, es.addr_offset);
if (err)
- return err;
+ goto out_put;
if (dbe-crp) {
err = thread_stack__process(thread, comm, sample, al,
addr_al, es.db_id,
dbe-crp);
if (err)
- return err;
+ goto out_put;
}
}
if (dbe-export_sample)
- return dbe-export_sample(dbe, es);
+ err = dbe-export_sample(dbe, es);
- return 0;
+out_put:
+ thread__put(main_thread);
+ return err;
}
static struct {
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
