perf tools: Move threads & last_match to threads.c
PATCH 1/1 perf tools: Move threads & last_match to threads.c
This was just being copy'n'pasted all over.
--- tools/perf/builtin-annotate.c | 18 +++++++----------- tools/perf/builtin-report.c | 17 +++++++---------- tools/perf/builtin-sched.c | 15 ++++++--------- tools/perf/builtin-trace.c | 9 +++------ tools/perf/util/thread.c | 40 ++++++++++++++++++---------------------- tools/perf/util/thread.h | 12 ++++-------- 6 files changed, 45 insertions(+), 66 deletions(-)
tools/perf/builtin-annotate.c +7 -11
@@ -37,10 +37,6 @@ static int print_line;static unsigned long page_size;static unsigned long mmap_window =32 ; -static struct rb_root threads; -static struct thread *last_match; - -struct sym_ext {struct rb_node node;double percent;
@@ -101,7 +97,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)struct map *map =NULL ;struct symbol *sym =NULL ; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid); dump_printf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n", (void *)(offset + head),
@@ -169,7 +165,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)struct thread *thread;struct map *map =map__new (&event->mmap,NULL ,0 ); - thread =threads__findnew (event->mmap.pid, &threads, &last_match); + thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -196,7 +192,7 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) {struct thread *thread; - thread =threads__findnew (event->comm.pid, &threads, &last_match); + thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -218,8 +214,8 @@ process_fork_event(event_t *event, unsigned long offset, unsigned long head)struct thread *thread;struct thread *parent; - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); + thread =threads__findnew (event->fork.pid); + parent =threads__findnew (event->fork.ppid); dump_printf("%p [%p]: PERF_RECORD_FORK: %d:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -558,7 +554,7 @@ static int __cmd_annotate(void)uint32_t size;char *buf; -register_idle_thread (&threads, &last_match); +register_idle_thread (); input =open (input_name,O_RDONLY );if (input <0 ) {
@@ -659,7 +655,7 @@ more:return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-report.c +7 -10
@@ -55,9 +55,6 @@ static char callchain_default_opt[] = "fractal,0.5";static char *cwd;static int cwdlen; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -601,7 +598,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)struct ip_callchain *chain =NULL ;int cpumode; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_PERIOD ) { period = *(u64 *)more_data;
@@ -688,7 +685,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)struct thread *thread;struct map *map =map__new (&event->mmap, cwd, cwdlen); - thread =threads__findnew (event->mmap.pid, &threads, &last_match); + thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -716,7 +713,7 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) {struct thread *thread; - thread =threads__findnew (event->comm.pid, &threads, &last_match); + thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -739,8 +736,8 @@ process_task_event(event_t *event, unsigned long offset, unsigned long head)struct thread *thread;struct thread *parent; - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); + thread =threads__findnew (event->fork.pid); + parent =threads__findnew (event->fork.ppid); dump_printf("%p [%p]: PERF_RECORD_%s: (%d:%d):(%d:%d)\n", (void *)(offset + head),
@@ -857,7 +854,7 @@ static int __cmd_report(void)struct thread *idle;int ret; - idle =register_idle_thread (&threads, &last_match); + idle =register_idle_thread ();thread__comm_adjust (idle);if (show_threads)
@@ -881,7 +878,7 @@ static int __cmd_report(void)return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-sched.c +6 -9
@@ -24,9 +24,6 @@ static char const *input_name = "perf.data";static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -638,7 +635,7 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) {struct thread *thread; - thread =threads__findnew (event->comm.pid, &threads, &last_match); + thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: perf_event_comm: %s:%d\n", (void *)(offset + head),
@@ -1039,7 +1036,7 @@ threads__findnew_from_ctx(u32 pid, struct trace_switch_event *switch_event) {struct thread *th; - th =threads__findnew_nocomm (pid, &threads, &last_match); + th =threads__findnew_nocomm (pid);if (th->comm)return th;
@@ -1055,7 +1052,7 @@ threads__findnew_from_wakeup(struct trace_wakeup_event *wakeup_event) {struct thread *th; - th =threads__findnew_nocomm (wakeup_event->pid, &threads, &last_match); + th =threads__findnew_nocomm (wakeup_event->pid);if (th->comm)return th;
@@ -1130,7 +1127,7 @@ latency_runtime_event(struct trace_runtime_event *runtime_event,BUG_ON (cpu >=MAX_CPUS || cpu <0 ); - thread =threads__findnew (runtime_event->pid, &threads, &last_match); + thread =threads__findnew (runtime_event->pid); atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);if (!atoms) {thread_atoms_insert (thread);
@@ -1589,7 +1586,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (!(sample_type &PERF_SAMPLE_RAW ))return 0 ; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -1662,7 +1659,7 @@ static struct perf_file_handler file_handler = {static int read_events (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/builtin-trace.c +3 -6
@@ -19,9 +19,6 @@ static char const *input_name = "perf.data";static unsigned long total =0 ;static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -34,7 +31,7 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) {struct thread *thread; - thread =threads__findnew (event->comm.pid, &threads, &last_match); + thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -61,7 +58,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)u64 period =1 ;void *more_data = event->ip.__more_data; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -135,7 +132,7 @@ static struct perf_file_handler file_handler = {static int __cmd_trace (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/util/thread.c +18 -22
@@ -6,6 +6,9 @@#include "util.h" #include "debug.h" +static struct rb_root threads; +static struct thread *last_match; +static struct thread *thread__new (pid_t pid,int set_comm) {struct thread *self =calloc (1 ,sizeof (*self));
@@ -52,12 +55,9 @@ static size_t thread__fprintf(struct thread *self, FILE *fp)return ret; } -static struct thread * -__threads__findnew (pid_t pid,struct rb_root *threads, -struct thread **last_match, -int set_comm) +static struct thread *__threads__findnew (pid_t pid,int set_comm) { -struct rb_node **p = &threads->rb_node; +struct rb_node **p = &threads.rb_node;struct rb_node *parent =NULL ;struct thread *th;
@@ -66,15 +66,15 @@ __threads__findnew(pid_t pid, struct rb_root *threads,* so most of the time we dont have to look up * the full rbtree: */ -if (*last_match && (*last_match)->pid == pid) -return *last_match; +if (last_match && last_match->pid == pid) +return last_match;while (*p !=NULL ) { parent = *p; th = rb_entry(parent, struct thread, rb_node);if (th->pid == pid) { - *last_match = th; + last_match = th;return th; }
@@ -88,30 +88,26 @@ __threads__findnew(pid_t pid, struct rb_root *threads,if (th !=NULL ) {rb_link_node (&th->rb_node, parent, p); -rb_insert_color (&th->rb_node, threads); - *last_match = th; +rb_insert_color (&th->rb_node, &threads); + last_match = th; }return th; } -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match) +struct thread *threads__findnew (pid_t pid) { -return __threads__findnew (pid, threads, last_match,1 ); +return __threads__findnew (pid,1 ); } -struct thread * -threads__findnew_nocomm (pid_t pid,struct rb_root *threads, -struct thread **last_match) +struct thread *threads__findnew_nocomm (pid_t pid) { -return __threads__findnew (pid, threads, last_match,0 ); +return __threads__findnew (pid,0 ); } -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match) +struct thread *register_idle_thread (void ) { -struct thread *thread =threads__findnew (0 , threads, last_match); +struct thread *thread =threads__findnew (0 );if (!thread ||thread__set_comm (thread,"swapper" )) {fprintf (stderr,"problem inserting idle task.\n" );
@@ -215,12 +211,12 @@ int thread__fork(struct thread *self, struct thread *parent)return 0 ; } -size_t threads__fprintf (FILE *fp,struct rb_root *threads) +size_t threads__fprintf (FILE *fp) {size_t ret =0 ;struct rb_node *nd; -for (nd =rb_first (threads); nd; nd =rb_next (nd)) { +for (nd =rb_first (&threads); nd; nd =rb_next (nd)) { struct thread *pos = rb_entry(nd, struct thread, rb_node); ret +=thread__fprintf (pos, fp);
tools/perf/util/thread.h +4 -8
@@ -15,16 +15,12 @@ struct thread { };int thread__set_comm (struct thread *self,const char *comm); -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match); -struct thread * -threads__findnew_nocomm (pid_t pid,struct rb_root *threads, -struct thread **last_match); -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match); +struct thread *threads__findnew (pid_t pid); +struct thread *threads__findnew_nocomm (pid_t pid); +struct thread *register_idle_thread (void );void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *self,struct thread *parent); -size_t threads__fprintf (FILE *fp,struct rb_root *threads); +size_t threads__fprintf (FILE *fp);void maps__insert (struct rb_root *maps,struct map *map);struct map *maps__find (struct rb_root *maps,u64 ip);
Signature · 1 line
1.6.2.5
Quoted 8 lines · Arnaldo Carvalho de Melo
This was just being copy'n'pasted all over.
Cc Frederic Weisbecker <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Paul Mackerras <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul Mackerras <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Quoted 8 lines
--- tools/perf/builtin-annotate.c | 18 +++++++----------- tools/perf/builtin-report.c | 17 +++++++---------- tools/perf/builtin-sched.c | 15 ++++++--------- tools/perf/builtin-trace.c | 9 +++------ tools/perf/util/thread.c | 40 ++++++++++++++++++---------------------- tools/perf/util/thread.h | 12 ++++-------- 6 files changed, 45 insertions(+), 66 deletions(-)
hm, mind refreshing this against latest -tip? It doesnt apply anymore:
Hunk #2 FAILED at 635.
Hunk #3 FAILED at 1036.
Hunk #4 FAILED at 1052.
Hunk #5 succeeded at 1122 (offset -5 lines).
Hunk #6 succeeded at 1651 (offset 65 lines).
Hunk #7 succeeded at 1657 (offset -2 lines).
3 out of 7 hunks FAILED -- rejects in file tools/perf/builtin-sched.c patching file tools/perf/builtin-trace.c
patching file tools/perf/util/thread.c
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 55.
Hunk #3 succeeded at 62 (offset -4 lines).
Hunk #4 FAILED at 84.
Hunk #5 succeeded at 197 (offset -14 lines).
3 out of 5 hunks FAILED -- rejects in file tools/perf/util/thread.c patching file tools/perf/util/thread.h
Hunk #1 FAILED at 15.
1 out of 1 hunk FAILED -- rejects in file tools/perf/util/thread.h
or have i missed some prereq patch?
Ingo
PATCH v2 1/1 perf tools: Move threads & last_match to threads.c
Em Mon, Oct 12, 2009 at 11:11:34AM +0200, Ingo Molnar escreveu:
Quoted 1 line
hm, mind refreshing this against latest -tip? It doesnt apply anymore:
Sure:
Quoted 1 line
From
4a1ab396733881fbd7b89693c6beeb40d1ae67edMon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Tue, 13 Oct 2009 09:14:46 -0200
Subject: [PATCH 1/1] perf tools: Move threads & last_match to threads.c
This was just being copy'n'pasted all over.
--- tools/perf/builtin-annotate.c | 25 +++++++------------------ tools/perf/builtin-report.c | 26 +++++++------------------- tools/perf/builtin-sched.c | 30 +++++++++++------------------- tools/perf/builtin-trace.c | 13 +++---------- tools/perf/util/thread.c | 27 ++++++++++++++------------- tools/perf/util/thread.h | 8 +++----- 6 files changed, 45 insertions(+), 84 deletions(-)
tools/perf/builtin-annotate.c +7 -18
@@ -37,10 +37,6 @@ static int print_line;static unsigned long page_size;static unsigned long mmap_window =32 ; -static struct rb_root threads; -static struct thread *last_match; - -struct sym_ext {struct rb_node node;double percent;
@@ -96,12 +92,10 @@ static int process_sample_event(event_t *event, unsigned long offset, unsigned long head) {char level; -struct thread *thread;u64 ip = event->ip.ip;struct map *map =NULL ;struct symbol *sym =NULL ; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid); dump_printf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n", (void *)(offset + head),
@@ -166,10 +160,8 @@ got_map:static int process_mmap_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;struct map *map =map__new (&event->mmap,NULL ,0 ); - - thread =threads__findnew (event->mmap.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -194,9 +186,8 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; +struct thread *thread =threads__findnew (event->comm.pid); - thread =threads__findnew (event->comm.pid, &threads, &last_match); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -215,11 +206,9 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_fork_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; -struct thread *parent; +struct thread *thread =threads__findnew (event->fork.pid); +struct thread *parent =threads__findnew (event->fork.ppid); - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); dump_printf("%p [%p]: PERF_RECORD_FORK: %d:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -558,7 +547,7 @@ static int __cmd_annotate(void)uint32_t size;char *buf; -register_idle_thread (&threads, &last_match); +register_idle_thread (); input =open (input_name,O_RDONLY );if (input <0 ) {
@@ -659,7 +648,7 @@ more:return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-report.c +7 -19
@@ -55,9 +55,6 @@ static char callchain_default_opt[] = "fractal,0.5";static char *cwd;static int cwdlen; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -593,15 +590,13 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) {char level;struct symbol *sym =NULL ; -struct thread *thread;u64 ip = event->ip.ip;u64 period =1 ;struct map *map =NULL ;void *more_data = event->ip.__more_data;struct ip_callchain *chain =NULL ;int cpumode; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_PERIOD ) { period = *(u64 *)more_data;
@@ -685,10 +680,8 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)static int process_mmap_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;struct map *map =map__new (&event->mmap, cwd, cwdlen); - - thread =threads__findnew (event->mmap.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -714,9 +707,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -736,11 +727,8 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_task_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; -struct thread *parent; - - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); +struct thread *thread =threads__findnew (event->fork.pid); +struct thread *parent =threads__findnew (event->fork.ppid); dump_printf("%p [%p]: PERF_RECORD_%s: (%d:%d):(%d:%d)\n", (void *)(offset + head),
@@ -857,7 +845,7 @@ static int __cmd_report(void)struct thread *idle;int ret; - idle =register_idle_thread (&threads, &last_match); + idle =register_idle_thread ();thread__comm_adjust (idle);if (show_threads)
@@ -881,7 +869,7 @@ static int __cmd_report(void)return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-sched.c +11 -19
@@ -24,9 +24,6 @@ static char const *input_name = "perf.data";static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -641,9 +638,7 @@ static void test_calibrations(void)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.tid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.tid); dump_printf("%p [%p]: perf_event_comm: %s:%d\n", (void *)(offset + head),
@@ -1086,8 +1081,8 @@ latency_switch_event(struct trace_switch_event *switch_event,die ("hm, delta: %Ld < 0 ?\n" , delta); - sched_out =threads__findnew (switch_event->prev_pid, &threads, &last_match); - sched_in =threads__findnew (switch_event->next_pid, &threads, &last_match); + sched_out =threads__findnew (switch_event->prev_pid); + sched_in =threads__findnew (switch_event->next_pid); out_events =thread_atoms_search (&atom_root, sched_out, &cmp_pid);if (!out_events) {
@@ -1120,13 +1115,10 @@ latency_runtime_event(struct trace_runtime_event *runtime_event,u64 timestamp, struct thread *this_thread __used) { - struct work_atoms *atoms; -struct thread *thread; + struct thread *thread = threads__findnew(runtime_event->pid); +struct work_atoms *atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);BUG_ON (cpu >=MAX_CPUS || cpu <0 ); - - thread =threads__findnew (runtime_event->pid, &threads, &last_match); - atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);if (!atoms) {thread_atoms_insert (thread); atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);
@@ -1153,7 +1145,7 @@ latency_wakeup_event(struct trace_wakeup_event *wakeup_event,if (!wakeup_event->success)return ; - wakee =threads__findnew (wakeup_event->pid, &threads, &last_match); + wakee =threads__findnew (wakeup_event->pid); atoms =thread_atoms_search (&atom_root, wakee, &cmp_pid);if (!atoms) {thread_atoms_insert (wakee);
@@ -1202,7 +1194,7 @@ latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event,if (profile_cpu ==-1 )return ; - migrant =threads__findnew (migrate_task_event->pid, &threads, &last_match); + migrant =threads__findnew (migrate_task_event->pid); atoms =thread_atoms_search (&atom_root, migrant, &cmp_pid);if (!atoms) {thread_atoms_insert (migrant);
@@ -1458,8 +1450,8 @@ map_switch_event(struct trace_switch_event *switch_event,die ("hm, delta: %Ld < 0 ?\n" , delta); - sched_out =threads__findnew (switch_event->prev_pid, &threads, &last_match); - sched_in =threads__findnew (switch_event->next_pid, &threads, &last_match); + sched_out =threads__findnew (switch_event->prev_pid); + sched_in =threads__findnew (switch_event->next_pid); curr_thread[this_cpu] = sched_in;
@@ -1649,7 +1641,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (!(sample_type &PERF_SAMPLE_RAW ))return 0 ; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -1725,7 +1717,7 @@ static struct perf_file_handler file_handler = {static int read_events (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/builtin-trace.c +3 -10
@@ -19,9 +19,6 @@ static char const *input_name = "perf.data";static unsigned long total =0 ;static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -32,9 +29,7 @@ static int cwdlen;static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -54,14 +49,12 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_sample_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;u64 ip = event->ip.ip;u64 timestamp =-1 ;u32 cpu =-1 ;u64 period =1 ;void *more_data = event->ip.__more_data; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -135,7 +128,7 @@ static struct perf_file_handler file_handler = {static int __cmd_trace (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/util/thread.c +14 -13
@@ -6,6 +6,9 @@#include "util.h" #include "debug.h" +static struct rb_root threads; +static struct thread *last_match; +static struct thread *thread__new (pid_t pid) {struct thread *self =calloc (1 ,sizeof (*self));
@@ -50,10 +53,9 @@ static size_t thread__fprintf(struct thread *self, FILE *fp)return ret; } -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match) +struct thread *threads__findnew (pid_t pid) { -struct rb_node **p = &threads->rb_node; +struct rb_node **p = &threads.rb_node;struct rb_node *parent =NULL ;struct thread *th;
@@ -62,15 +64,15 @@ threads__findnew(pid_t pid, struct rb_root *threads, struct thread **last_match)* so most of the time we dont have to look up * the full rbtree: */ -if (*last_match && (*last_match)->pid == pid) -return *last_match; +if (last_match && last_match->pid == pid) +return last_match;while (*p !=NULL ) { parent = *p; th = rb_entry(parent, struct thread, rb_node);if (th->pid == pid) { - *last_match = th; + last_match = th;return th; }
@@ -83,17 +85,16 @@ threads__findnew(pid_t pid, struct rb_root *threads, struct thread **last_match) th =thread__new (pid);if (th !=NULL ) {rb_link_node (&th->rb_node, parent, p); -rb_insert_color (&th->rb_node, threads); - *last_match = th; +rb_insert_color (&th->rb_node, &threads); + last_match = th; }return th; } -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match) +struct thread *register_idle_thread (void ) { -struct thread *thread =threads__findnew (0 , threads, last_match); +struct thread *thread =threads__findnew (0 );if (!thread ||thread__set_comm (thread,"swapper" )) {fprintf (stderr,"problem inserting idle task.\n" );
@@ -197,12 +198,12 @@ int thread__fork(struct thread *self, struct thread *parent)return 0 ; } -size_t threads__fprintf (FILE *fp,struct rb_root *threads) +size_t threads__fprintf (FILE *fp) {size_t ret =0 ;struct rb_node *nd; -for (nd =rb_first (threads); nd; nd =rb_next (nd)) { +for (nd =rb_first (&threads); nd; nd =rb_next (nd)) { struct thread *pos = rb_entry(nd, struct thread, rb_node); ret +=thread__fprintf (pos, fp);
tools/perf/util/thread.h +3 -5
@@ -15,13 +15,11 @@ struct thread { };int thread__set_comm (struct thread *self,const char *comm); -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match); -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match); +struct thread *threads__findnew (pid_t pid); +struct thread *register_idle_thread (void );void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *self,struct thread *parent); -size_t threads__fprintf (FILE *fp,struct rb_root *threads); +size_t threads__fprintf (FILE *fp);void maps__insert (struct rb_root *maps,struct map *map);struct map *maps__find (struct rb_root *maps,u64 ip);
Signature · 1 line
1.5.5.1
Commit-ID: d5b889f2ecec7849e851ddd31c34bdfb3482b5de Gitweb: http://git.kernel.org/tip/d5b889f2ecec7849e851ddd31c34bdfb3482b5de Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 13 Oct 2009 11:16:29 -0300 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 13 Oct 2009 17:12:18 +0200
perf tools: Move threads & last_match to threads.c
This was just being copy'n'pasted all over.
LKML-Reference: <[email protected]>
--- tools/perf/builtin-annotate.c | 25 +++++++------------------ tools/perf/builtin-report.c | 26 +++++++------------------- tools/perf/builtin-sched.c | 30 +++++++++++------------------- tools/perf/builtin-trace.c | 13 +++---------- tools/perf/util/thread.c | 27 ++++++++++++++------------- tools/perf/util/thread.h | 8 +++----- 6 files changed, 45 insertions(+), 84 deletions(-)
tools/perf/builtin-annotate.c +7 -18
@@ -37,10 +37,6 @@ static int print_line;static unsigned long page_size;static unsigned long mmap_window =32 ; -static struct rb_root threads; -static struct thread *last_match; - -struct sym_ext {struct rb_node node;double percent;
@@ -96,12 +92,10 @@ static int process_sample_event(event_t *event, unsigned long offset, unsigned long head) {char level; -struct thread *thread;u64 ip = event->ip.ip;struct map *map =NULL ;struct symbol *sym =NULL ; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid); dump_printf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n", (void *)(offset + head),
@@ -166,10 +160,8 @@ got_map:static int process_mmap_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;struct map *map =map__new (&event->mmap,NULL ,0 ); - - thread =threads__findnew (event->mmap.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -194,9 +186,8 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; +struct thread *thread =threads__findnew (event->comm.pid); - thread =threads__findnew (event->comm.pid, &threads, &last_match); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -215,11 +206,9 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_fork_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; -struct thread *parent; +struct thread *thread =threads__findnew (event->fork.pid); +struct thread *parent =threads__findnew (event->fork.ppid); - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); dump_printf("%p [%p]: PERF_RECORD_FORK: %d:%d\n", (void *)(offset + head), (void *)(long)(event->header.size),
@@ -558,7 +547,7 @@ static int __cmd_annotate(void)uint32_t size;char *buf; -register_idle_thread (&threads, &last_match); +register_idle_thread (); input =open (input_name,O_RDONLY );if (input <0 ) {
@@ -659,7 +648,7 @@ more:return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-report.c +7 -19
@@ -55,9 +55,6 @@ static char callchain_default_opt[] = "fractal,0.5";static char *cwd;static int cwdlen; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -593,15 +590,13 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) {char level;struct symbol *sym =NULL ; -struct thread *thread;u64 ip = event->ip.ip;u64 period =1 ;struct map *map =NULL ;void *more_data = event->ip.__more_data;struct ip_callchain *chain =NULL ;int cpumode; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_PERIOD ) { period = *(u64 *)more_data;
@@ -685,10 +680,8 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)static int process_mmap_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;struct map *map =map__new (&event->mmap, cwd, cwdlen); - - thread =threads__findnew (event->mmap.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->mmap.pid); dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n", (void *)(offset + head),
@@ -714,9 +707,7 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -736,11 +727,8 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_task_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; -struct thread *parent; - - thread =threads__findnew (event->fork.pid, &threads, &last_match); - parent =threads__findnew (event->fork.ppid, &threads, &last_match); +struct thread *thread =threads__findnew (event->fork.pid); +struct thread *parent =threads__findnew (event->fork.ppid); dump_printf("%p [%p]: PERF_RECORD_%s: (%d:%d):(%d:%d)\n", (void *)(offset + head),
@@ -857,7 +845,7 @@ static int __cmd_report(void)struct thread *idle;int ret; - idle =register_idle_thread (&threads, &last_match); + idle =register_idle_thread ();thread__comm_adjust (idle);if (show_threads)
@@ -881,7 +869,7 @@ static int __cmd_report(void)return 0 ;if (verbose >3 ) -threads__fprintf (stdout, &threads); +threads__fprintf (stdout);if (verbose >2 )dsos__fprintf (stdout);
tools/perf/builtin-sched.c +11 -19
@@ -24,9 +24,6 @@ static char const *input_name = "perf.data";static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -641,9 +638,7 @@ static void test_calibrations(void)static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.tid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.tid); dump_printf("%p [%p]: perf_event_comm: %s:%d\n", (void *)(offset + head),
@@ -1086,8 +1081,8 @@ latency_switch_event(struct trace_switch_event *switch_event,die ("hm, delta: %Ld < 0 ?\n" , delta); - sched_out =threads__findnew (switch_event->prev_pid, &threads, &last_match); - sched_in =threads__findnew (switch_event->next_pid, &threads, &last_match); + sched_out =threads__findnew (switch_event->prev_pid); + sched_in =threads__findnew (switch_event->next_pid); out_events =thread_atoms_search (&atom_root, sched_out, &cmp_pid);if (!out_events) {
@@ -1120,13 +1115,10 @@ latency_runtime_event(struct trace_runtime_event *runtime_event,u64 timestamp, struct thread *this_thread __used) { - struct work_atoms *atoms; -struct thread *thread; + struct thread *thread = threads__findnew(runtime_event->pid); +struct work_atoms *atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);BUG_ON (cpu >=MAX_CPUS || cpu <0 ); - - thread =threads__findnew (runtime_event->pid, &threads, &last_match); - atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);if (!atoms) {thread_atoms_insert (thread); atoms =thread_atoms_search (&atom_root, thread, &cmp_pid);
@@ -1153,7 +1145,7 @@ latency_wakeup_event(struct trace_wakeup_event *wakeup_event,if (!wakeup_event->success)return ; - wakee =threads__findnew (wakeup_event->pid, &threads, &last_match); + wakee =threads__findnew (wakeup_event->pid); atoms =thread_atoms_search (&atom_root, wakee, &cmp_pid);if (!atoms) {thread_atoms_insert (wakee);
@@ -1202,7 +1194,7 @@ latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event,if (profile_cpu ==-1 )return ; - migrant =threads__findnew (migrate_task_event->pid, &threads, &last_match); + migrant =threads__findnew (migrate_task_event->pid); atoms =thread_atoms_search (&atom_root, migrant, &cmp_pid);if (!atoms) {thread_atoms_insert (migrant);
@@ -1458,8 +1450,8 @@ map_switch_event(struct trace_switch_event *switch_event,die ("hm, delta: %Ld < 0 ?\n" , delta); - sched_out =threads__findnew (switch_event->prev_pid, &threads, &last_match); - sched_in =threads__findnew (switch_event->next_pid, &threads, &last_match); + sched_out =threads__findnew (switch_event->prev_pid); + sched_in =threads__findnew (switch_event->next_pid); curr_thread[this_cpu] = sched_in;
@@ -1649,7 +1641,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (!(sample_type &PERF_SAMPLE_RAW ))return 0 ; - thread =threads__findnew (event->ip.pid, &threads, &last_match); + thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -1725,7 +1717,7 @@ static struct perf_file_handler file_handler = {static int read_events (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/builtin-trace.c +3 -10
@@ -19,9 +19,6 @@ static char const *input_name = "perf.data";static unsigned long total =0 ;static unsigned long total_comm =0 ; -static struct rb_root threads; -static struct thread *last_match; -static struct perf_header *header;static u64 sample_type;
@@ -32,9 +29,7 @@ static int cwdlen;static int process_comm_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread; - - thread =threads__findnew (event->comm.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->comm.pid); dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n", (void *)(offset + head),
@@ -54,14 +49,12 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head)static int process_sample_event (event_t *event,unsigned long offset,unsigned long head) { -struct thread *thread;u64 ip = event->ip.ip;u64 timestamp =-1 ;u32 cpu =-1 ;u64 period =1 ;void *more_data = event->ip.__more_data; - - thread =threads__findnew (event->ip.pid, &threads, &last_match); +struct thread *thread =threads__findnew (event->ip.pid);if (sample_type &PERF_SAMPLE_TIME ) { timestamp = *(u64 *)more_data;
@@ -135,7 +128,7 @@ static struct perf_file_handler file_handler = {static int __cmd_trace (void ) { -register_idle_thread (&threads, &last_match); +register_idle_thread ();register_perf_file_handler (&file_handler);return mmap_dispatch_perf_file (&header, input_name,0 ,0 , &cwdlen, &cwd);
tools/perf/util/thread.c +14 -13
@@ -6,6 +6,9 @@#include "util.h" #include "debug.h" +static struct rb_root threads; +static struct thread *last_match; +static struct thread *thread__new (pid_t pid) {struct thread *self =calloc (1 ,sizeof (*self));
@@ -50,10 +53,9 @@ static size_t thread__fprintf(struct thread *self, FILE *fp)return ret; } -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match) +struct thread *threads__findnew (pid_t pid) { -struct rb_node **p = &threads->rb_node; +struct rb_node **p = &threads.rb_node;struct rb_node *parent =NULL ;struct thread *th;
@@ -62,15 +64,15 @@ threads__findnew(pid_t pid, struct rb_root *threads, struct thread **last_match)* so most of the time we dont have to look up * the full rbtree: */ -if (*last_match && (*last_match)->pid == pid) -return *last_match; +if (last_match && last_match->pid == pid) +return last_match;while (*p !=NULL ) { parent = *p; th = rb_entry(parent, struct thread, rb_node);if (th->pid == pid) { - *last_match = th; + last_match = th;return th; }
@@ -83,17 +85,16 @@ threads__findnew(pid_t pid, struct rb_root *threads, struct thread **last_match) th =thread__new (pid);if (th !=NULL ) {rb_link_node (&th->rb_node, parent, p); -rb_insert_color (&th->rb_node, threads); - *last_match = th; +rb_insert_color (&th->rb_node, &threads); + last_match = th; }return th; } -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match) +struct thread *register_idle_thread (void ) { -struct thread *thread =threads__findnew (0 , threads, last_match); +struct thread *thread =threads__findnew (0 );if (!thread ||thread__set_comm (thread,"swapper" )) {fprintf (stderr,"problem inserting idle task.\n" );
@@ -197,12 +198,12 @@ int thread__fork(struct thread *self, struct thread *parent)return 0 ; } -size_t threads__fprintf (FILE *fp,struct rb_root *threads) +size_t threads__fprintf (FILE *fp) {size_t ret =0 ;struct rb_node *nd; -for (nd =rb_first (threads); nd; nd =rb_next (nd)) { +for (nd =rb_first (&threads); nd; nd =rb_next (nd)) { struct thread *pos = rb_entry(nd, struct thread, rb_node); ret +=thread__fprintf (pos, fp);
tools/perf/util/thread.h +3 -5
@@ -15,13 +15,11 @@ struct thread { };int thread__set_comm (struct thread *self,const char *comm); -struct thread * -threads__findnew (pid_t pid,struct rb_root *threads,struct thread **last_match); -struct thread * -register_idle_thread (struct rb_root *threads,struct thread **last_match); +struct thread *threads__findnew (pid_t pid); +struct thread *register_idle_thread (void );void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *self,struct thread *parent); -size_t threads__fprintf (FILE *fp,struct rb_root *threads); +size_t threads__fprintf (FILE *fp);void maps__insert (struct rb_root *maps,struct map *map);struct map *maps__find (struct rb_root *maps,u64 ip);