diff options
Diffstat (limited to 'tools/perf/ui/browsers/map.c')
-rw-r--r-- | tools/perf/ui/browsers/map.c | 40 |
1 files changed, 20 insertions, 20 deletions
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 { | |||
18 | u8 addrlen; | 18 | u8 addrlen; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | static void map_browser__write(struct ui_browser *self, void *nd, int row) | 21 | static void map_browser__write(struct ui_browser *browser, void *nd, int row) |
22 | { | 22 | { |
23 | struct symbol *sym = rb_entry(nd, struct symbol, rb_node); | 23 | struct symbol *sym = rb_entry(nd, struct symbol, rb_node); |
24 | struct map_browser *mb = container_of(self, struct map_browser, b); | 24 | struct map_browser *mb = container_of(browser, struct map_browser, b); |
25 | bool current_entry = ui_browser__is_current_entry(self, row); | 25 | bool current_entry = ui_browser__is_current_entry(browser, row); |
26 | int width; | 26 | int width; |
27 | 27 | ||
28 | ui_browser__set_percent_color(self, 0, current_entry); | 28 | ui_browser__set_percent_color(browser, 0, current_entry); |
29 | slsmg_printf("%*" PRIx64 " %*" PRIx64 " %c ", | 29 | slsmg_printf("%*" PRIx64 " %*" PRIx64 " %c ", |
30 | mb->addrlen, sym->start, mb->addrlen, sym->end, | 30 | mb->addrlen, sym->start, mb->addrlen, sym->end, |
31 | sym->binding == STB_GLOBAL ? 'g' : | 31 | sym->binding == STB_GLOBAL ? 'g' : |
32 | sym->binding == STB_LOCAL ? 'l' : 'w'); | 32 | sym->binding == STB_LOCAL ? 'l' : 'w'); |
33 | width = self->width - ((mb->addrlen * 2) + 4); | 33 | width = browser->width - ((mb->addrlen * 2) + 4); |
34 | if (width > 0) | 34 | if (width > 0) |
35 | slsmg_write_nstring(sym->name, width); | 35 | slsmg_write_nstring(sym->name, width); |
36 | } | 36 | } |
37 | 37 | ||
38 | /* FIXME uber-kludgy, see comment on cmd_report... */ | 38 | /* FIXME uber-kludgy, see comment on cmd_report... */ |
39 | static u32 *symbol__browser_index(struct symbol *self) | 39 | static u32 *symbol__browser_index(struct symbol *browser) |
40 | { | 40 | { |
41 | return ((void *)self) - sizeof(struct rb_node) - sizeof(u32); | 41 | return ((void *)browser) - sizeof(struct rb_node) - sizeof(u32); |
42 | } | 42 | } |
43 | 43 | ||
44 | static int map_browser__search(struct map_browser *self) | 44 | static int map_browser__search(struct map_browser *browser) |
45 | { | 45 | { |
46 | char target[512]; | 46 | char target[512]; |
47 | struct symbol *sym; | 47 | struct symbol *sym; |
@@ -53,37 +53,37 @@ static int map_browser__search(struct map_browser *self) | |||
53 | 53 | ||
54 | if (target[0] == '0' && tolower(target[1]) == 'x') { | 54 | if (target[0] == '0' && tolower(target[1]) == 'x') { |
55 | u64 addr = strtoull(target, NULL, 16); | 55 | u64 addr = strtoull(target, NULL, 16); |
56 | sym = map__find_symbol(self->map, addr, NULL); | 56 | sym = map__find_symbol(browser->map, addr, NULL); |
57 | } else | 57 | } else |
58 | sym = map__find_symbol_by_name(self->map, target, NULL); | 58 | sym = map__find_symbol_by_name(browser->map, target, NULL); |
59 | 59 | ||
60 | if (sym != NULL) { | 60 | if (sym != NULL) { |
61 | u32 *idx = symbol__browser_index(sym); | 61 | u32 *idx = symbol__browser_index(sym); |
62 | 62 | ||
63 | self->b.top = &sym->rb_node; | 63 | browser->b.top = &sym->rb_node; |
64 | self->b.index = self->b.top_idx = *idx; | 64 | browser->b.index = browser->b.top_idx = *idx; |
65 | } else | 65 | } else |
66 | ui_helpline__fpush("%s not found!", target); | 66 | ui_helpline__fpush("%s not found!", target); |
67 | 67 | ||
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | static int map_browser__run(struct map_browser *self) | 71 | static int map_browser__run(struct map_browser *browser) |
72 | { | 72 | { |
73 | int key; | 73 | int key; |
74 | 74 | ||
75 | if (ui_browser__show(&self->b, self->map->dso->long_name, | 75 | if (ui_browser__show(&browser->b, browser->map->dso->long_name, |
76 | "Press <- or ESC to exit, %s / to search", | 76 | "Press <- or ESC to exit, %s / to search", |
77 | verbose ? "" : "restart with -v to use") < 0) | 77 | verbose ? "" : "restart with -v to use") < 0) |
78 | return -1; | 78 | return -1; |
79 | 79 | ||
80 | while (1) { | 80 | while (1) { |
81 | key = ui_browser__run(&self->b, 0); | 81 | key = ui_browser__run(&browser->b, 0); |
82 | 82 | ||
83 | switch (key) { | 83 | switch (key) { |
84 | case '/': | 84 | case '/': |
85 | if (verbose) | 85 | if (verbose) |
86 | map_browser__search(self); | 86 | map_browser__search(browser); |
87 | default: | 87 | default: |
88 | break; | 88 | break; |
89 | case K_LEFT: | 89 | case K_LEFT: |
@@ -94,20 +94,20 @@ static int map_browser__run(struct map_browser *self) | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | out: | 96 | out: |
97 | ui_browser__hide(&self->b); | 97 | ui_browser__hide(&browser->b); |
98 | return key; | 98 | return key; |
99 | } | 99 | } |
100 | 100 | ||
101 | int map__browse(struct map *self) | 101 | int map__browse(struct map *map) |
102 | { | 102 | { |
103 | struct map_browser mb = { | 103 | struct map_browser mb = { |
104 | .b = { | 104 | .b = { |
105 | .entries = &self->dso->symbols[self->type], | 105 | .entries = &map->dso->symbols[map->type], |
106 | .refresh = ui_browser__rb_tree_refresh, | 106 | .refresh = ui_browser__rb_tree_refresh, |
107 | .seek = ui_browser__rb_tree_seek, | 107 | .seek = ui_browser__rb_tree_seek, |
108 | .write = map_browser__write, | 108 | .write = map_browser__write, |
109 | }, | 109 | }, |
110 | .map = self, | 110 | .map = map, |
111 | }; | 111 | }; |
112 | struct rb_node *nd; | 112 | struct rb_node *nd; |
113 | char tmp[BITS_PER_LONG / 4]; | 113 | char tmp[BITS_PER_LONG / 4]; |