| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 27 Jun 2013 10:52:03 -0600
From: David Ahern <dsahern@...il.com>
To: Adrian Hunter <adrian.hunter@...el.com>
CC: Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
linux-kernel@...r.kernel.org,
Frederic Weisbecker <fweisbec@...il.com>,
Jiri Olsa <jolsa@...hat.com>, Mike Galbraith <efault@....de>,
Namhyung Kim <namhyung@...il.com>,
Paul Mackerras <paulus@...ba.org>,
Peter Zijlstra <peterz@...radead.org>,
Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCH V2 14/15] perf tools: add pid to struct thread
On 6/27/13 1:55 AM, Adrian Hunter wrote:
> Record pid on struct thread. The member is named 'pid_'
> to avoid confusion with the 'tid' member which was previously
> named 'pid'.
>
> Note that while "machine" functions update 'pid_', most tools
> do not.
You are doing multiple things in this patch. Please make the
introduction and use of machine__findnew_thread_ex a standalone patch.
David
>
> Signed-off-by: Adrian Hunter <adrian.hunter@...el.com>
> ---
> tools/perf/util/machine.c | 47 ++++++++++++++++++++++++++++++++++++++---------
> tools/perf/util/machine.h | 4 ++++
> tools/perf/util/thread.c | 3 ++-
> tools/perf/util/thread.h | 3 ++-
> 4 files changed, 46 insertions(+), 11 deletions(-)
>
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index ef0be97..d11ca3b 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -233,7 +233,8 @@ void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size)
> return;
> }
>
> -static struct thread *__machine__findnew_thread(struct machine *machine, pid_t tid,
> +static struct thread *__machine__findnew_thread(struct machine *machine,
> + pid_t pid, pid_t tid,
> bool create)
> {
> struct rb_node **p = &machine->threads.rb_node;
> @@ -245,8 +246,11 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t t
> * so most of the time we dont have to look up
> * the full rbtree:
> */
> - if (machine->last_match && machine->last_match->tid == tid)
> + if (machine->last_match && machine->last_match->tid == tid) {
> + if (pid && !machine->last_match->pid_)
> + machine->last_match->pid_ = pid;
> return machine->last_match;
> + }
>
> while (*p != NULL) {
> parent = *p;
> @@ -254,6 +258,8 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t t
>
> if (th->tid == tid) {
> machine->last_match = th;
> + if (pid && !th->pid_)
> + th->pid_ = pid;
> return th;
> }
>
> @@ -266,7 +272,7 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t t
> if (!create)
> return NULL;
>
> - th = thread__new(tid);
> + th = thread__new(pid, tid);
> if (th != NULL) {
> rb_link_node(&th->rb_node, parent, p);
> rb_insert_color(&th->rb_node, &machine->threads);
> @@ -278,17 +284,25 @@ static struct thread *__machine__findnew_thread(struct machine *machine, pid_t t
>
> struct thread *machine__findnew_thread(struct machine *machine, pid_t tid)
> {
> - return __machine__findnew_thread(machine, tid, true);
> + return __machine__findnew_thread(machine, 0, tid, true);
> +}
> +
> +struct thread *machine__findnew_thread_ex(struct machine *machine, pid_t pid,
> + pid_t tid)
> +{
> + return __machine__findnew_thread(machine, pid, tid, true);
> }
>
> struct thread *machine__find_thread(struct machine *machine, pid_t tid)
> {
> - return __machine__findnew_thread(machine, tid, false);
> + return __machine__findnew_thread(machine, 0, tid, false);
> }
>
> int machine__process_comm_event(struct machine *machine, union perf_event *event)
> {
> - struct thread *thread = machine__findnew_thread(machine, event->comm.tid);
> + struct thread *thread = machine__findnew_thread_ex(machine,
> + event->comm.pid,
> + event->comm.tid);
>
> if (dump_trace)
> perf_event__fprintf_comm(event, stdout);
> @@ -969,7 +983,8 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
> return 0;
> }
>
> - thread = machine__findnew_thread(machine, event->mmap.pid);
> + thread = machine__findnew_thread_ex(machine, event->mmap.pid,
> + event->mmap.pid);
> if (thread == NULL)
> goto out_problem;
>
> @@ -996,8 +1011,12 @@ out_problem:
>
> int machine__process_fork_event(struct machine *machine, union perf_event *event)
> {
> - struct thread *thread = machine__findnew_thread(machine, event->fork.tid);
> - struct thread *parent = machine__findnew_thread(machine, event->fork.ptid);
> + struct thread *thread = machine__findnew_thread_ex(machine,
> + event->fork.pid,
> + event->fork.tid);
> + struct thread *parent = machine__findnew_thread_ex(machine,
> + event->fork.ppid,
> + event->fork.ptid);
>
> if (dump_trace)
> perf_event__fprintf_task(event, stdout);
> @@ -1264,3 +1283,13 @@ int machine__resolve_callchain(struct machine *machine,
> sample);
>
> }
> +
> +pid_t machine__get_thread_pid(struct machine *machine, pid_t tid)
> +{
> + struct thread *thread = machine__find_thread(machine, tid);
> +
> + if (!thread)
> + return 0;
> +
> + return thread->pid_;
> +}
> diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
> index e49ba01..11a53d5 100644
> --- a/tools/perf/util/machine.h
> +++ b/tools/perf/util/machine.h
> @@ -100,6 +100,8 @@ static inline bool machine__is_host(struct machine *machine)
> }
>
> struct thread *machine__findnew_thread(struct machine *machine, pid_t tid);
> +struct thread *machine__findnew_thread_ex(struct machine *machine, pid_t pid,
> + pid_t tid);
>
> size_t machine__fprintf(struct machine *machine, FILE *fp);
>
> @@ -156,4 +158,6 @@ void machines__destroy_kernel_maps(struct machines *machines);
>
> size_t machine__fprintf_vmlinux_path(struct machine *machine, FILE *fp);
>
> +pid_t machine__get_thread_pid(struct machine *machine, pid_t tid);
> +
> #endif /* __PERF_MACHINE_H */
> diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
> index 6feeb88..e3d4a55 100644
> --- a/tools/perf/util/thread.c
> +++ b/tools/perf/util/thread.c
> @@ -7,12 +7,13 @@
> #include "util.h"
> #include "debug.h"
>
> -struct thread *thread__new(pid_t tid)
> +struct thread *thread__new(pid_t pid, pid_t tid)
> {
> struct thread *self = zalloc(sizeof(*self));
>
> if (self != NULL) {
> map_groups__init(&self->mg);
> + self->pid_ = pid;
> self->tid = tid;
> self->ppid = -1;
> self->comm = malloc(32);
> diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
> index 37a86a3..bfa68e7 100644
> --- a/tools/perf/util/thread.h
> +++ b/tools/perf/util/thread.h
> @@ -12,6 +12,7 @@ struct thread {
> struct list_head node;
> };
> struct map_groups mg;
> + pid_t pid_; /* Not all tools update this */
> pid_t tid;
> pid_t ppid;
> char shortname[3];
> @@ -24,7 +25,7 @@ struct thread {
>
> struct machine;
>
> -struct thread *thread__new(pid_t tid);
> +struct thread *thread__new(pid_t pid, pid_t tid);
> void thread__delete(struct thread *self);
>
> int thread__set_comm(struct thread *self, const char *comm);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists