perf tools: Stop using 'self' in some more places
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: c824c4338ac47979c69ba6f8faab33670ae179df Gitweb: http://git.kernel.org/tip/c824c4338ac47979c69ba6f8faab33670ae179df Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 22 Oct 2013 19:01:31 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 23 Oct 2013 09:55:37 -0300
perf tools: Stop using 'self' in some more places
As suggested by tglx, 'self' should be replaced by something that is more useful.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-annotate.c | 4 +- tools/perf/builtin-diff.c | 5 +- tools/perf/builtin-inject.c | 22 ++++---- tools/perf/builtin-report.c | 14 ++--- tools/perf/util/build-id.c | 6 +- tools/perf/util/hist.c | 18 +++--- tools/perf/util/sort.c | 124 +++++++++++++++++++++--------------------- tools/perf/util/strfilter.c | 46 ++++++++-------- tools/perf/util/thread.c | 72 ++++++++++++------------ 9 files changed, 155 insertions(+), 156 deletions(-)
tools/perf/builtin-annotate.c +2 -2
@@ -118,11 +118,11 @@ static int hist_entry__tty_annotate(struct hist_entry *he, ann->print_line, ann->full_paths, 0, 0); } -static void hists__find_annotations (struct hists *self, +static void hists__find_annotations (struct hists *hists,struct perf_evsel *evsel,struct perf_annotate *ann) { -struct rb_node *nd =rb_first (&self->entries), *next; +struct rb_node *nd =rb_first (&hists->entries), *next;int key =K_RIGHT ;while (nd) {
tools/perf/builtin-diff.c +2 -3
@@ -303,12 +303,11 @@ static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,return -1 ; } -static int hists__add_entry (struct hists *self, +static int hists__add_entry (struct hists *hists,struct addr_location *al,u64 period,u64 weight,u64 transaction) { -if (__hists__add_entry (self, al,NULL , period, weight, transaction) - !=NULL ) +if (__hists__add_entry (hists, al,NULL , period, weight, transaction) !=NULL )return 0 ;return -ENOMEM ; }
tools/perf/builtin-inject.c +11 -11
@@ -162,38 +162,38 @@ static int perf_event__repipe_tracing_data(struct perf_tool *tool,return err; } -static int dso__read_build_id (struct dso *self) +static int dso__read_build_id (struct dso *dso) { -if (self->has_build_id) +if (dso->has_build_id)return 0 ; -if (filename__read_build_id (self->long_name, self->build_id, -sizeof (self->build_id)) >0 ) { - self->has_build_id = true; +if (filename__read_build_id (dso->long_name, dso->build_id, +sizeof (dso->build_id)) >0 ) { + dso->has_build_id = true;return 0 ; }return -1 ; } -static int dso__inject_build_id (struct dso *self,struct perf_tool *tool, +static int dso__inject_build_id (struct dso *dso,struct perf_tool *tool,struct machine *machine) {u16 misc =PERF_RECORD_MISC_USER ;int err; -if (dso__read_build_id (self) <0 ) { -pr_debug ("no build_id found for %s\n" , self->long_name); +if (dso__read_build_id (dso) <0 ) { +pr_debug ("no build_id found for %s\n" , dso->long_name);return -1 ; } -if (self->kernel) +if (dso->kernel) misc =PERF_RECORD_MISC_KERNEL ; - err =perf_event__synthesize_build_id (tool, self, misc, perf_event__repipe, + err =perf_event__synthesize_build_id (tool, dso, misc, perf_event__repipe, machine);if (err) { -pr_err ("Can't synthesize build_id event for %s\n" , self->long_name); +pr_err ("Can't synthesize build_id event for %s\n" , dso->long_name);return -1 ; }
tools/perf/builtin-report.c +7 -7
@@ -373,9 +373,9 @@ static int process_read_event(struct perf_tool *tool,/* For pipe mode, sample_type is not currently set */ static int perf_report__setup_sample_type (struct perf_report *rep) { -struct perf_session *self = rep->session; -u64 sample_type =perf_evlist__combined_sample_type (self->evlist); -bool is_pipe =perf_data_file__is_pipe (self->file); +struct perf_session *session = rep->session; +u64 sample_type =perf_evlist__combined_sample_type (session->evlist); +bool is_pipe =perf_data_file__is_pipe (session->file);if (!is_pipe && !(sample_type &PERF_SAMPLE_CALLCHAIN )) {if (sort__has_parent) {
@@ -417,14 +417,14 @@ static void sig_handler(int sig __maybe_unused) }static size_t hists__fprintf_nr_sample_events (struct perf_report *rep, -struct hists *self, +struct hists *hists,const char *evname,FILE *fp) {size_t ret;char unit; -unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE ]; -u64 nr_events = self->stats.total_period; -struct perf_evsel *evsel =hists_to_evsel (self); +unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE ]; +u64 nr_events = hists->stats.total_period; +struct perf_evsel *evsel =hists_to_evsel (hists);char buf[512 ];size_t size =sizeof (buf);
tools/perf/util/build-id.c +3 -3
@@ -89,14 +89,14 @@ int build_id__sprintf(const u8 *build_id, int len, char *bf)return raw - build_id; } -char *dso__build_id_filename (struct dso *self,char *bf,size_t size) +char *dso__build_id_filename (struct dso *dso,char *bf,size_t size) {char build_id_hex[BUILD_ID_SIZE *2 +1 ]; -if (!self->has_build_id) +if (!dso->has_build_id)return NULL ; -build_id__sprintf (self->build_id,sizeof (self->build_id), build_id_hex); +build_id__sprintf (dso->build_id,sizeof (dso->build_id), build_id_hex);if (bf ==NULL ) {if (asprintf (&bf,"%s/.build-id/%.2s/%s" , buildid_dir, build_id_hex, build_id_hex +2 ) <0 )
tools/perf/util/hist.c +9 -9
@@ -406,7 +406,7 @@ out:return he; } -struct hist_entry *__hists__add_mem_entry(struct hists *self, +struct hist_entry *__hists__add_mem_entry(struct hists *hists, struct addr_location *al, struct symbol *sym_parent, struct mem_info *mi,
@@ -429,14 +429,14 @@ struct hist_entry *__hists__add_mem_entry(struct hists *self, .level = al->level, .parent = sym_parent, .filtered = symbol__parent_filter(sym_parent), - .hists = self, + .hists = hists, .mem_info = mi, .branch_info = NULL, }; -return add_hist_entry (self, &entry, al, period, weight); +return add_hist_entry (hists, &entry, al, period, weight); } -struct hist_entry *__hists__add_branch_entry(struct hists *self, +struct hist_entry *__hists__add_branch_entry(struct hists *hists, struct addr_location *al, struct symbol *sym_parent, struct branch_info *bi,
@@ -460,14 +460,14 @@ struct hist_entry *__hists__add_branch_entry(struct hists *self, .parent = sym_parent, .filtered = symbol__parent_filter(sym_parent), .branch_info = bi, - .hists = self, + .hists = hists, .mem_info = NULL, }; -return add_hist_entry (self, &entry, al, period, weight); +return add_hist_entry (hists, &entry, al, period, weight); } -struct hist_entry *__hists__add_entry (struct hists *self, +struct hist_entry *__hists__add_entry (struct hists *hists,struct addr_location *al,struct symbol *sym_parent,u64 period,u64 weight,u64 transaction)
@@ -488,13 +488,13 @@ struct hist_entry *__hists__add_entry(struct hists *self, }, .parent = sym_parent, .filtered = symbol__parent_filter(sym_parent), - .hists = self, + .hists = hists, .branch_info = NULL, .mem_info = NULL, .transaction = transaction, }; -return add_hist_entry (self, &entry, al, period, weight); +return add_hist_entry (hists, &entry, al, period, weight); }int64_t
tools/perf/util/sort.c +62 -62
349 lines not on this page · raw message
tools/perf/util/strfilter.c +23 -23
75 lines not on this page · raw message
tools/perf/util/thread.c +36 -36
117 lines not on this page · raw message