Skip to content

Commit

Permalink
perf thread: Allow tools to register a thread->priv destructor
Browse files Browse the repository at this point in the history
So that when thread__delete() runs it can be called and free stuff tools
stashed into thread->priv, like 'perf trace' does and will use this
new facility to plug some leaks.

Added an assert(thread__priv_destructor == NULL) as suggested in Ian's
review.

Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/CAP-5=fV3Er=Ek8=iE=bSGbEBmM56_PJffMWot1g_5Bh8B5hO7A@mail.gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
acmel committed Jul 20, 2023
1 parent 3f6a74b commit 04cb4fc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
13 changes: 13 additions & 0 deletions tools/perf/util/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ struct thread *thread__new(pid_t pid, pid_t tid)
return NULL;
}

static void (*thread__priv_destructor)(void *priv);

void thread__set_priv_destructor(void (*destructor)(void *priv))
{
assert(thread__priv_destructor == NULL);

thread__priv_destructor = destructor;
}

void thread__delete(struct thread *thread)
{
struct namespaces *namespaces, *tmp_namespaces;
Expand Down Expand Up @@ -112,6 +121,10 @@ void thread__delete(struct thread *thread)
exit_rwsem(thread__namespaces_lock(thread));
exit_rwsem(thread__comm_lock(thread));
thread__free_stitch_list(thread);

if (thread__priv_destructor)
thread__priv_destructor(thread__priv(thread));

RC_CHK_FREE(thread);
}

Expand Down
2 changes: 2 additions & 0 deletions tools/perf/util/thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ struct thread *thread__new(pid_t pid, pid_t tid);
int thread__init_maps(struct thread *thread, struct machine *machine);
void thread__delete(struct thread *thread);

void thread__set_priv_destructor(void (*destructor)(void *priv));

struct thread *thread__get(struct thread *thread);
void thread__put(struct thread *thread);

Expand Down

0 comments on commit 04cb4fc

Please sign in to comment.