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>
This commit is contained in:
@@ -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];
|
||||
|
||||
Reference in New Issue
Block a user