perf tools: Finish the removal of 'self' arguments

They convey no information, perhaps I was bitten by some snake at some
point, complete the detox by naming the last of those arguments more
sensibly.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-u1r0dnjoro08dgztiy2g3t2q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

6 files changed, 48 insertions, 50 deletions

diff --git a/tools/perf/ui/browser.h b/tools/perf/ui/browser.h
index 404ff66a3e36..7d45d2f53601 100644
--- a/tools/perf/ui/browser.h
+++ b/tools/perf/ui/browser.h
@@ -21,32 +21,32 @@ struct ui_browser {
         void          *priv;
         const char    *title;
         char          *helpline;
-        unsigned int  (*refresh)(struct ui_browser *self);
-        void          (*write)(struct ui_browser *self, void *entry, int row);
-        void          (*seek)(struct ui_browser *self, off_t offset, int whence);
-        bool          (*filter)(struct ui_browser *self, void *entry);
+        unsigned int  (*refresh)(struct ui_browser *browser);
+        void          (*write)(struct ui_browser *browser, void *entry, int row);
+        void          (*seek)(struct ui_browser *browser, off_t offset, int whence);
+        bool          (*filter)(struct ui_browser *browser, void *entry);
         u32           nr_entries;
         bool          navkeypressed;
         bool          use_navkeypressed;
 };
 
 int  ui_browser__set_color(struct ui_browser *browser, int color);
-void ui_browser__set_percent_color(struct ui_browser *self,
+void ui_browser__set_percent_color(struct ui_browser *browser,
                                    double percent, bool current);
-bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row);
-void ui_browser__refresh_dimensions(struct ui_browser *self);
-void ui_browser__reset_index(struct ui_browser *self);
+bool ui_browser__is_current_entry(struct ui_browser *browser, unsigned row);
+void ui_browser__refresh_dimensions(struct ui_browser *browser);
+void ui_browser__reset_index(struct ui_browser *browser);
 
-void ui_browser__gotorc(struct ui_browser *self, int y, int x);
+void ui_browser__gotorc(struct ui_browser *browser, int y, int x);
 void ui_browser__write_graph(struct ui_browser *browser, int graph);
 void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
                               u64 start, u64 end);
 void __ui_browser__show_title(struct ui_browser *browser, const char *title);
 void ui_browser__show_title(struct ui_browser *browser, const char *title);
-int ui_browser__show(struct ui_browser *self, const char *title,
+int ui_browser__show(struct ui_browser *browser, const char *title,
                      const char *helpline, ...);
-void ui_browser__hide(struct ui_browser *self);
-int ui_browser__refresh(struct ui_browser *self);
+void ui_browser__hide(struct ui_browser *browser);
+int ui_browser__refresh(struct ui_browser *browser);
 int ui_browser__run(struct ui_browser *browser, int delay_secs);
 void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries);
 void ui_browser__handle_resize(struct ui_browser *browser);
@@ -63,11 +63,11 @@ int ui_browser__input_window(const char *title, const char *text, char *input,
 void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence);
 unsigned int ui_browser__argv_refresh(struct ui_browser *browser);
 
-void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);
-unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self);
+void ui_browser__rb_tree_seek(struct ui_browser *browser, off_t offset, int whence);
+unsigned int ui_browser__rb_tree_refresh(struct ui_browser *browser);
 
-void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whence);
-unsigned int ui_browser__list_head_refresh(struct ui_browser *self);
+void ui_browser__list_head_seek(struct ui_browser *browser, off_t offset, int whence);
+unsigned int ui_browser__list_head_refresh(struct ui_browser *browser);
 
 void ui_browser__init(void);
 void annotate_browser__init(void);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index a91b6b219412..16848bb4c418 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1889,7 +1889,7 @@ out:
         return key;
 }
 
-static bool filter_group_entries(struct ui_browser *self __maybe_unused,
+static bool filter_group_entries(struct ui_browser *browser __maybe_unused,
                                  void *entry)
 {
         struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
diff --git a/tools/perf/ui/browsers/map.c b/tools/perf/ui/browsers/map.c
index 95c7cfb8f2c6..b11639f33682 100644
--- a/tools/perf/ui/browsers/map.c
+++ b/tools/perf/ui/browsers/map.c
@@ -18,30 +18,30 @@ struct map_browser {
         u8                addrlen;
 };
 
-static void map_browser__write(struct ui_browser *self, void *nd, int row)
+static void map_browser__write(struct ui_browser *browser, void *nd, int row)
 {
         struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
-        struct map_browser *mb = container_of(self, struct map_browser, b);
-        bool current_entry = ui_browser__is_current_entry(self, row);
+        struct map_browser *mb = container_of(browser, struct map_browser, b);
+        bool current_entry = ui_browser__is_current_entry(browser, row);
         int width;
 
-        ui_browser__set_percent_color(self, 0, current_entry);
+        ui_browser__set_percent_color(browser, 0, current_entry);
         slsmg_printf("%*" PRIx64 " %*" PRIx64 " %c ",
                      mb->addrlen, sym->start, mb->addrlen, sym->end,
                      sym->binding == STB_GLOBAL ? 'g' :
                      sym->binding == STB_LOCAL  ? 'l' : 'w');
-        width = self->width - ((mb->addrlen * 2) + 4);
+        width = browser->width - ((mb->addrlen * 2) + 4);
         if (width > 0)
                 slsmg_write_nstring(sym->name, width);
 }
 
 /* FIXME uber-kludgy, see comment on cmd_report... */
-static u32 *symbol__browser_index(struct symbol *self)
+static u32 *symbol__browser_index(struct symbol *browser)
 {
-        return ((void *)self) - sizeof(struct rb_node) - sizeof(u32);
+        return ((void *)browser) - sizeof(struct rb_node) - sizeof(u32);
 }
 
-static int map_browser__search(struct map_browser *self)
+static int map_browser__search(struct map_browser *browser)
 {
         char target[512];
         struct symbol *sym;
@@ -53,37 +53,37 @@ static int map_browser__search(struct map_browser *self)
 
         if (target[0] == '0' && tolower(target[1]) == 'x') {
                 u64 addr = strtoull(target, NULL, 16);
-                sym = map__find_symbol(self->map, addr, NULL);
+                sym = map__find_symbol(browser->map, addr, NULL);
         } else
-                sym = map__find_symbol_by_name(self->map, target, NULL);
+                sym = map__find_symbol_by_name(browser->map, target, NULL);
 
         if (sym != NULL) {
                 u32 *idx = symbol__browser_index(sym);
 
-                self->b.top = &sym->rb_node;
-                self->b.index = self->b.top_idx = *idx;
+                browser->b.top = &sym->rb_node;
+                browser->b.index = browser->b.top_idx = *idx;
         } else
                 ui_helpline__fpush("%s not found!", target);
 
         return 0;
 }
 
-static int map_browser__run(struct map_browser *self)
+static int map_browser__run(struct map_browser *browser)
 {
         int key;
 
-        if (ui_browser__show(&self->b, self->map->dso->long_name,
+        if (ui_browser__show(&browser->b, browser->map->dso->long_name,
                              "Press <- or ESC to exit, %s / to search",
                              verbose ? "" : "restart with -v to use") < 0)
                 return -1;
 
         while (1) {
-                key = ui_browser__run(&self->b, 0);
+                key = ui_browser__run(&browser->b, 0);
 
                 switch (key) {
                 case '/':
                         if (verbose)
-                                map_browser__search(self);
+                                map_browser__search(browser);
                 default:
                         break;
                 case K_LEFT:
@@ -94,20 +94,20 @@ static int map_browser__run(struct map_browser *self)
                 }
         }
 out:
-        ui_browser__hide(&self->b);
+        ui_browser__hide(&browser->b);
         return key;
 }
 
-int map__browse(struct map *self)
+int map__browse(struct map *map)
 {
         struct map_browser mb = {
                 .b = {
-                        .entries = &self->dso->symbols[self->type],
+                        .entries = &map->dso->symbols[map->type],
                         .refresh = ui_browser__rb_tree_refresh,
                         .seek    = ui_browser__rb_tree_seek,
                         .write   = map_browser__write,
                 },
-                .map = self,
+                .map = map,
         };
         struct rb_node *nd;
         char tmp[BITS_PER_LONG / 4];
diff --git a/tools/perf/ui/browsers/map.h b/tools/perf/ui/browsers/map.h
index df8581a43e17..2d58e4b3eb6f 100644
--- a/tools/perf/ui/browsers/map.h
+++ b/tools/perf/ui/browsers/map.h
@@ -2,5 +2,5 @@
 #define _PERF_UI_MAP_BROWSER_H_ 1
 struct map;
 
-int map__browse(struct map *self);
+int map__browse(struct map *map);
 #endif /* _PERF_UI_MAP_BROWSER_H_ */
diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c
index 12f009e61e94..d63c68ea02a8 100644
--- a/tools/perf/ui/browsers/scripts.c
+++ b/tools/perf/ui/browsers/scripts.c
@@ -84,22 +84,22 @@ static void script_browser__write(struct ui_browser *browser,
         slsmg_write_nstring(sline->line, browser->width);
 }
 
-static int script_browser__run(struct perf_script_browser *self)
+static int script_browser__run(struct perf_script_browser *browser)
 {
         int key;
 
-        if (ui_browser__show(&self->b, self->script_name,
+        if (ui_browser__show(&browser->b, browser->script_name,
                              "Press <- or ESC to exit") < 0)
                 return -1;
 
         while (1) {
-                key = ui_browser__run(&self->b, 0);
+                key = ui_browser__run(&browser->b, 0);
 
                 /* We can add some special key handling here if needed */
                 break;
         }
 
-        ui_browser__hide(&self->b);
+        ui_browser__hide(&browser->b);
         return key;
 }
 
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 6c152686e837..c244cb524ef2 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -213,20 +213,19 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
         return ret;
 }
 
-static size_t __callchain__fprintf_flat(FILE *fp,
-                                        struct callchain_node *self,
+static size_t __callchain__fprintf_flat(FILE *fp, struct callchain_node *node,
                                         u64 total_samples)
 {
         struct callchain_list *chain;
         size_t ret = 0;
 
-        if (!self)
+        if (!node)
                 return 0;
 
-        ret += __callchain__fprintf_flat(fp, self->parent, total_samples);
+        ret += __callchain__fprintf_flat(fp, node->parent, total_samples);
 
 
-        list_for_each_entry(chain, &self->val, list) {
+        list_for_each_entry(chain, &node->val, list) {
                 if (chain->ip >= PERF_CONTEXT_MAX)
                         continue;
                 if (chain->ms.sym)
@@ -239,15 +238,14 @@ static size_t __callchain__fprintf_flat(FILE *fp,
         return ret;
 }
 
-static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self,
+static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *tree,
                                       u64 total_samples)
 {
         size_t ret = 0;
         u32 entries_printed = 0;
-        struct rb_node *rb_node;
         struct callchain_node *chain;
+        struct rb_node *rb_node = rb_first(tree);
 
-        rb_node = rb_first(self);
         while (rb_node) {
                 double percent;