perf tools: Use an accessor to read thread comm
tip-bot for Frederic Weisbecker
merge botCommit-ID: b9c5143a012a543c4ee872498d6dbae5c10beb2e Gitweb: http://git.kernel.org/tip/b9c5143a012a543c4ee872498d6dbae5c10beb2e Author: Frederic Weisbecker <[email protected]> AuthorDate: Wed, 11 Sep 2013 14:46:56 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 11:50:28 -0300
perf tools: Use an accessor to read thread comm
As the thread comm is going to be implemented by way of a more complicated data structure than just a pointer to a string from the thread struct, convert the readers of comm to use an accessor instead of accessing it directly.
The accessor will be later overriden to support an enhanced comm implementation.
Signed-off-by Frederic Weisbecker <[email protected]>
Tested-by Jiri Olsa <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc David Ahern <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Stephane Eranian <[email protected]>
[ Rename thread__comm_curr() to thread__comm_str() ]
Signed-off-by Namhyung Kim <[email protected]>
[ Fixed up some minor const pointer issues ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-sched.c | 16 ++++++++-------- tools/perf/builtin-script.c | 6 +++--- tools/perf/tests/hists_link.c | 2 +- tools/perf/ui/browsers/hists.c | 10 +++++----- tools/perf/util/event.c | 4 ++-- tools/perf/util/scripting-engines/trace-event-perl.c | 2 +- tools/perf/util/scripting-engines/trace-event-python.c | 4 ++-- tools/perf/util/sort.c | 11 ++++++----- tools/perf/util/thread.c | 7 ++++++- tools/perf/util/thread.h | 1 + 12 files changed, 37 insertions(+), 30 deletions(-)
tools/perf/builtin-kmem.c +1 -1
@@ -315,7 +315,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,return -1 ; } -dump_printf (" ... thread: %s:%d\n" , thread->comm, thread->tid); +dump_printf (" ... thread: %s:%d\n" ,thread__comm_str (thread), thread->tid);if (evsel->handler.func !=NULL ) {tracepoint_handler f = evsel->handler.func;
tools/perf/builtin-lock.c +1 -1
@@ -767,7 +767,7 @@ static void dump_threads(void)while (node) { st = container_of(node, struct thread_stat, rb); t =perf_session__findnew (session, st->tid); -pr_info ("%10d: %s\n" , st->tid, t->comm); +pr_info ("%10d: %s\n" , st->tid,thread__comm_str (t)); node =rb_next (node); }; }
tools/perf/builtin-sched.c +8 -8
@@ -737,12 +737,12 @@ static int replay_fork_event(struct perf_sched *sched,if (verbose) {printf ("fork event\n" ); -printf ("... parent: %s/%d\n" , parent->comm, parent->tid); -printf ("... child: %s/%d\n" , child->comm, child->tid); +printf ("... parent: %s/%d\n" ,thread__comm_str (parent), parent->tid); +printf ("... child: %s/%d\n" ,thread__comm_str (child), child->tid); } -register_pid (sched, parent->tid, parent->comm); -register_pid (sched, child->tid, child->comm); +register_pid (sched, parent->tid,thread__comm_str (parent)); +register_pid (sched, child->tid,thread__comm_str (child));return 0 ; }
@@ -1077,7 +1077,7 @@ static int latency_migrate_task_event(struct perf_sched *sched,if (!atoms) {if (thread_atoms_insert (sched, migrant))return -1 ; -register_pid (sched, migrant->tid, migrant->comm); +register_pid (sched, migrant->tid,thread__comm_str (migrant)); atoms =thread_atoms_search (&sched->atom_root, migrant, &sched->cmp_pid);if (!atoms) {pr_err ("migration-event: Internal tree error" );
@@ -1111,13 +1111,13 @@ static void output_lat_thread(struct perf_sched *sched, struct work_atoms *work_/* * Ignore idle threads: */ -if (!strcmp (work_list->thread->comm,"swapper" )) +if (!strcmp (thread__comm_str (work_list->thread),"swapper" ))return ; sched->all_runtime += work_list->total_runtime; sched->all_count += work_list->nb_atoms; - ret =printf (" %s:%d " , work_list->thread->comm, work_list->thread->tid); + ret =printf (" %s:%d " ,thread__comm_str (work_list->thread), work_list->thread->tid);for (i =0 ; i <24 - ret; i++)printf (" " );
@@ -1334,7 +1334,7 @@ static int map_switch_event(struct perf_sched *sched, struct perf_evsel *evsel,printf (" %12.6f secs " , (double )timestamp/1e9 );if (new_shortname) {printf ("%s => %s:%d\n" , - sched_in->shortname, sched_in->comm, sched_in->tid); + sched_in->shortname,thread__comm_str (sched_in), sched_in->tid); }else {printf ("\n" ); }
tools/perf/builtin-script.c +3 -3
@@ -291,11 +291,11 @@ static void print_sample_start(struct perf_sample *sample,if (PRINT_FIELD (COMM )) {if (latency_format) -printf ("%8.8s " , thread->comm); +printf ("%8.8s " ,thread__comm_str (thread));else if (PRINT_FIELD (IP ) && symbol_conf.use_callchain) -printf ("%s " , thread->comm); +printf ("%s " ,thread__comm_str (thread));else -printf ("%16s " , thread->comm); +printf ("%16s " ,thread__comm_str (thread)); }if (PRINT_FIELD (PID ) &&PRINT_FIELD (TID ))
tools/perf/tests/hists_link.c +1 -1
@@ -421,7 +421,7 @@ static void print_hists(struct hists *hists) he = rb_entry(node, struct hist_entry, rb_node_in);pr_info ("%2d: entry: %-8s [%-8s] %20s: period = %" PRIu64"\n" , - i, he->thread->comm, he->ms.map->dso->short_name, + i,thread__comm_str (he->thread), he->ms.map->dso->short_name, he->ms.sym->name, he->stat.period); i++;
tools/perf/ui/browsers/hists.c +5 -5
@@ -1255,7 +1255,7 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,if (thread) printed +=scnprintf (bf + printed, size - printed,", Thread: %s(%d)" , - (thread->comm_set ? thread->comm :"" ), + (thread->comm_set ?thread__comm_str (thread) :"" ), thread->tid);if (dso) printed += scnprintf(bf + printed, size - printed,
@@ -1578,7 +1578,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (thread !=NULL &&asprintf (&options[nr_options],"Zoom %s %s(%d) thread" , (browser->hists->thread_filter ?"out of" :"into" ), - (thread->comm_set ? thread->comm :"" ), + (thread->comm_set ?thread__comm_str (thread) :"" ), thread->tid) >0 ) zoom_thread = nr_options++;
@@ -1598,7 +1598,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,struct symbol *sym;if (asprintf (&options[nr_options],"Run scripts for samples of thread [%s]" , - browser->he_selection->thread->comm) >0 ) +thread__comm_str (browser->he_selection->thread)) >0 ) scripts_comm = nr_options++; sym = browser->he_selection->ms.sym;
@@ -1701,7 +1701,7 @@ zoom_out_thread: sort_thread.elide = false; }else {ui_helpline__fpush ("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"" , - thread->comm_set ? thread->comm :"" , + thread->comm_set ?thread__comm_str (thread) :"" , thread->tid); browser->hists->thread_filter = thread; sort_thread.elide = true;
@@ -1717,7 +1717,7 @@ do_scripts:memset (script_opt,0 ,64 );if (choice == scripts_comm) -sprintf (script_opt," -c %s " , browser->he_selection->thread->comm); +sprintf (script_opt," -c %s " ,thread__comm_str (browser->he_selection->thread));if (choice == scripts_symbol)sprintf (script_opt," -S %s " , browser->he_selection->ms.sym->name);
tools/perf/util/event.c +2 -2
@@ -721,10 +721,10 @@ int perf_event__preprocess_sample(const union perf_event *event,return -1 ;if (symbol_conf.comm_list && - !strlist__has_entry (symbol_conf.comm_list, thread->comm)) + !strlist__has_entry (symbol_conf.comm_list,thread__comm_str (thread))) goto out_filtered; -dump_printf (" ... thread: %s:%d\n" , thread->comm, thread->tid); +dump_printf (" ... thread: %s:%d\n" ,thread__comm_str (thread), thread->tid);/* * Have we already created the kernel maps for this machine? *
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -273,7 +273,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,int cpu = sample->cpu;void *data = sample->raw_data;unsigned long long nsecs = sample->time; -char *comm = thread->comm; +const char *comm =thread__comm_str (thread); dSP;
tools/perf/util/scripting-engines/trace-event-python.c +2 -2
@@ -250,7 +250,7 @@ static void python_process_tracepoint(union perf_event *perf_eventint cpu = sample->cpu;void *data = sample->raw_data;unsigned long long nsecs = sample->time; -char *comm = thread->comm; +const char *comm =thread__comm_str (thread); t =PyTuple_New (MAX_FIELDS );if (!t)
@@ -389,7 +389,7 @@ static void python_process_general_event(union perf_event *perf_eventpydict_set_item_string_decref (dict,"raw_buf" ,PyString_FromStringAndSize ( (const char *)sample->raw_data, sample->raw_size));pydict_set_item_string_decref (dict,"comm" , -PyString_FromString (thread->comm)); +PyString_FromString (thread__comm_str (thread)));if (al->map) {pydict_set_item_string_decref (dict,"dso" ,PyString_FromString (al->map->dso->name));
tools/perf/util/sort.c +6 -5
@@ -42,7 +42,7 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)return n; } -static int64_t cmp_null (void *l,void *r) +static int64_t cmp_null (const void *l,const void *r) {if (!l && !r)return 0 ;
@@ -63,8 +63,9 @@ sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)static int hist_entry__thread_snprintf (struct hist_entry *he,char *bf,size_t size,unsigned int width) { +const char *comm =thread__comm_str (he->thread);return repsep_snprintf (bf, size,"%*s:%5d" , width -6 , - he->thread->comm ?:"" , he->thread->tid); + comm ?:"" , he->thread->tid); }struct sort_entry sort_thread = {
@@ -85,8 +86,8 @@ sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)static int64_t sort__comm_collapse (struct hist_entry *left,struct hist_entry *right) { -char *comm_l = left->thread->comm; -char *comm_r = right->thread->comm; +const char *comm_l =thread__comm_str (left->thread); +const char *comm_r =thread__comm_str (right->thread);if (!comm_l || !comm_r)return cmp_null (comm_l, comm_r);
@@ -97,7 +98,7 @@ sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)static int hist_entry__comm_snprintf (struct hist_entry *he,char *bf,size_t size,unsigned int width) { -return repsep_snprintf (bf, size,"%*s" , width, he->thread->comm); +return repsep_snprintf (bf, size,"%*s" , width,thread__comm_str (he->thread)); }struct sort_entry sort_comm = {
tools/perf/util/thread.c +6 -1
@@ -45,6 +45,11 @@ int thread__set_comm(struct thread *thread, const char *comm)return err; } +const char *thread__comm_str (const struct thread *thread) +{ +return thread->comm; +} +int thread__comm_len (struct thread *thread) {if (!thread->comm_len) {
@@ -58,7 +63,7 @@ int thread__comm_len(struct thread *thread)size_t thread__fprintf (struct thread *thread,FILE *fp) { -return fprintf (fp,"Thread %d %s\n" , thread->tid, thread->comm) + +return fprintf (fp,"Thread %d %s\n" , thread->tid,thread__comm_str (thread)) +map_groups__fprintf (&thread->mg, verbose, fp); }
tools/perf/util/thread.h +1 -0
@@ -35,6 +35,7 @@ static inline void thread__exited(struct thread *thread)int thread__set_comm (struct thread *self,const char *comm);int thread__comm_len (struct thread *self); +const char *thread__comm_str (const struct thread *thread);void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *self,struct thread *parent);size_t thread__fprintf (struct thread *thread,FILE *fp);