All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
	linux-kernel@vger.kernel.org,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
	Namhyung Kim <namhyung@gmail.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH V2 14/15] perf tools: add pid to struct thread
Date: Thu, 27 Jun 2013 10:52:03 -0600	[thread overview]
Message-ID: <51CC6DB3.2020501@gmail.com> (raw)
In-Reply-To: <1372319707-13892-15-git-send-email-adrian.hunter@intel.com>

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@intel.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);
>


  reply	other threads:[~2013-06-27 16:52 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-27  7:54 [PATCH V2 00/15] perf tools: some fixes and tweaks Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 01/15] perf tools: remove unused parameter Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 02/15] perf tools: fix missing tool parameter Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 03/15] perf tools: fix missing 'finished_round' Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 04/15] perf tools: fix parse_events_terms() segfault on error path Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 05/15] perf tools: fix new_term() missing free " Adrian Hunter
2013-06-27  7:54 ` [PATCH V2 06/15] perf tools: fix parse_events_terms() freeing local variable " Adrian Hunter
2013-06-27 16:13   ` David Ahern
2013-06-28  6:32     ` Adrian Hunter
2013-06-28 13:41       ` David Ahern
2013-06-28 13:57         ` Jiri Olsa
2013-06-27  7:54 ` [PATCH V2 07/15] perf tools: add const specifier to perf_pmu__find name parameter Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 08/15] perf tools: tidy duplicated munmap code Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 09/15] perf tools: validate perf event header size Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 10/15] perf tools: add debug prints Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 11/15] perf tools: fix symbol_conf.nr_events Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 12/15] perf tools: allow non-matching sample types Adrian Hunter
2013-06-27 16:39   ` David Ahern
2013-07-01  9:32     ` Adrian Hunter
2013-07-01 18:53       ` David Ahern
2013-07-01 19:10         ` Stephane Eranian
2013-07-02  6:58           ` Adrian Hunter
2013-07-03  6:40             ` Stephane Eranian
2013-07-02  7:09         ` Adrian Hunter
2013-07-03  6:44           ` Stephane Eranian
2013-08-26 18:54             ` Arnaldo Carvalho de Melo
2013-06-27  7:55 ` [PATCH V2 13/15] perf tools: struct thread has a tid not a pid Adrian Hunter
2013-06-27  7:55 ` [PATCH V2 14/15] perf tools: add pid to struct thread Adrian Hunter
2013-06-27 16:52   ` David Ahern [this message]
2013-06-27  7:55 ` [PATCH V2 15/15] perf tools: fix ppid in thread__fork() Adrian Hunter
2013-06-27 16:57   ` David Ahern
2013-06-28  6:47     ` Adrian Hunter
2013-06-28 13:46       ` David Ahern

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=51CC6DB3.2020501@gmail.com \
    --to=dsahern@gmail.com \
    --cc=acme@ghostprotocols.net \
    --cc=adrian.hunter@intel.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=namhyung@gmail.com \
    --cc=paulus@samba.org \
    --cc=peterz@infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.