aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/perf/Makefile5
-rw-r--r--tools/perf/util/newt.c156
-rw-r--r--tools/perf/util/ui/browsers/map.c163
-rw-r--r--tools/perf/util/ui/browsers/map.h6
4 files changed, 175 insertions, 155 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index ae443b68e519..d118020014ff 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -570,9 +570,11 @@ else
570 LIB_OBJS += $(OUTPUT)util/newt.o 570 LIB_OBJS += $(OUTPUT)util/newt.o
571 LIB_OBJS += $(OUTPUT)util/ui/browser.o 571 LIB_OBJS += $(OUTPUT)util/ui/browser.o
572 LIB_OBJS += $(OUTPUT)util/ui/browsers/annotate.o 572 LIB_OBJS += $(OUTPUT)util/ui/browsers/annotate.o
573 LIB_OBJS += $(OUTPUT)util/ui/browsers/map.o
573 LIB_OBJS += $(OUTPUT)util/ui/helpline.o 574 LIB_OBJS += $(OUTPUT)util/ui/helpline.o
574 LIB_OBJS += $(OUTPUT)util/ui/progress.o 575 LIB_OBJS += $(OUTPUT)util/ui/progress.o
575 LIB_H += util/ui/browser.h 576 LIB_H += util/ui/browser.h
577 LIB_H += util/ui/browsers/map.h
576 LIB_H += util/ui/helpline.h 578 LIB_H += util/ui/helpline.h
577 LIB_H += util/ui/libslang.h 579 LIB_H += util/ui/libslang.h
578 LIB_H += util/ui/progress.h 580 LIB_H += util/ui/progress.h
@@ -982,6 +984,9 @@ $(OUTPUT)util/ui/browser.o: util/ui/browser.c $(OUTPUT)PERF-CFLAGS
982$(OUTPUT)util/ui/browsers/annotate.o: util/ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS 984$(OUTPUT)util/ui/browsers/annotate.o: util/ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS
983 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< 985 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<
984 986
987$(OUTPUT)util/ui/browsers/map.o: util/ui/browsers/map.c $(OUTPUT)PERF-CFLAGS
988 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<
989
985$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS 990$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS
986 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< 991 $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
987 992
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index f1882589c826..b596926afa2b 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -16,42 +16,10 @@
16#include "symbol.h" 16#include "symbol.h"
17#include "ui/browser.h" 17#include "ui/browser.h"
18#include "ui/helpline.h" 18#include "ui/helpline.h"
19#include "ui/browsers/map.h"
19 20
20newtComponent newt_form__new(void); 21newtComponent newt_form__new(void);
21 22
22static int ui_entry__read(const char *title, char *bf, size_t size, int width)
23{
24 struct newtExitStruct es;
25 newtComponent form, entry;
26 const char *result;
27 int err = -1;
28
29 newtCenteredWindow(width, 1, title);
30 form = newtForm(NULL, NULL, 0);
31 if (form == NULL)
32 return -1;
33
34 entry = newtEntry(0, 0, "0x", width, &result, NEWT_FLAG_SCROLL);
35 if (entry == NULL)
36 goto out_free_form;
37
38 newtFormAddComponent(form, entry);
39 newtFormAddHotKey(form, NEWT_KEY_ENTER);
40 newtFormAddHotKey(form, NEWT_KEY_ESCAPE);
41 newtFormAddHotKey(form, NEWT_KEY_LEFT);
42 newtFormAddHotKey(form, CTRL('c'));
43 newtFormRun(form, &es);
44
45 if (result != NULL) {
46 strncpy(bf, result, size);
47 err = 0;
48 }
49out_free_form:
50 newtPopWindow();
51 newtFormDestroy(form);
52 return 0;
53}
54
55char browser__last_msg[1024]; 23char browser__last_msg[1024];
56 24
57int browser__show_help(const char *format, va_list ap) 25int browser__show_help(const char *format, va_list ap)
@@ -182,128 +150,6 @@ static char *callchain_list__sym_name(struct callchain_list *self,
182 return bf; 150 return bf;
183} 151}
184 152
185/* -------------------------------------------------------------------- */
186
187struct map_browser {
188 struct ui_browser b;
189 struct map *map;
190 u16 namelen;
191 u8 addrlen;
192};
193
194static void map_browser__write(struct ui_browser *self, void *nd, int row)
195{
196 struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
197 struct map_browser *mb = container_of(self, struct map_browser, b);
198 bool current_entry = ui_browser__is_current_entry(self, row);
199 int color = ui_browser__percent_color(0, current_entry);
200
201 SLsmg_set_color(color);
202 slsmg_printf("%*llx %*llx %c ",
203 mb->addrlen, sym->start, mb->addrlen, sym->end,
204 sym->binding == STB_GLOBAL ? 'g' :
205 sym->binding == STB_LOCAL ? 'l' : 'w');
206 slsmg_write_nstring(sym->name, mb->namelen);
207}
208
209/* FIXME uber-kludgy, see comment on cmd_report... */
210static u32 *symbol__browser_index(struct symbol *self)
211{
212 return ((void *)self) - sizeof(struct rb_node) - sizeof(u32);
213}
214
215static int map_browser__search(struct map_browser *self)
216{
217 char target[512];
218 struct symbol *sym;
219 int err = ui_entry__read("Search by name/addr", target, sizeof(target), 40);
220
221 if (err)
222 return err;
223
224 if (target[0] == '0' && tolower(target[1]) == 'x') {
225 u64 addr = strtoull(target, NULL, 16);
226 sym = map__find_symbol(self->map, addr, NULL);
227 } else
228 sym = map__find_symbol_by_name(self->map, target, NULL);
229
230 if (sym != NULL) {
231 u32 *idx = symbol__browser_index(sym);
232
233 self->b.top = &sym->rb_node;
234 self->b.index = self->b.top_idx = *idx;
235 } else
236 ui_helpline__fpush("%s not found!", target);
237
238 return 0;
239}
240
241static int map_browser__run(struct map_browser *self, struct newtExitStruct *es)
242{
243 if (ui_browser__show(&self->b, self->map->dso->long_name) < 0)
244 return -1;
245
246 ui_helpline__fpush("Press <- or ESC to exit, %s / to search",
247 verbose ? "" : "restart with -v to use");
248 newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
249 newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);
250 if (verbose)
251 newtFormAddHotKey(self->b.form, '/');
252
253 while (1) {
254 ui_browser__run(&self->b, es);
255
256 if (es->reason != NEWT_EXIT_HOTKEY)
257 break;
258 if (verbose && es->u.key == '/')
259 map_browser__search(self);
260 else
261 break;
262 }
263
264 newtFormDestroy(self->b.form);
265 newtPopWindow();
266 ui_helpline__pop();
267 return 0;
268}
269
270static int map__browse(struct map *self)
271{
272 struct map_browser mb = {
273 .b = {
274 .entries = &self->dso->symbols[self->type],
275 .refresh = ui_browser__rb_tree_refresh,
276 .seek = ui_browser__rb_tree_seek,
277 .write = map_browser__write,
278 },
279 .map = self,
280 };
281 struct newtExitStruct es;
282 struct rb_node *nd;
283 char tmp[BITS_PER_LONG / 4];
284 u64 maxaddr = 0;
285
286 for (nd = rb_first(mb.b.entries); nd; nd = rb_next(nd)) {
287 struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
288
289 if (mb.namelen < pos->namelen)
290 mb.namelen = pos->namelen;
291 if (maxaddr < pos->end)
292 maxaddr = pos->end;
293 if (verbose) {
294 u32 *idx = symbol__browser_index(pos);
295 *idx = mb.b.nr_entries;
296 }
297 ++mb.b.nr_entries;
298 }
299
300 mb.addrlen = snprintf(tmp, sizeof(tmp), "%llx", maxaddr);
301 mb.b.width += mb.addrlen * 2 + 4 + mb.namelen;
302 return map_browser__run(&mb, &es);
303}
304
305/* -------------------------------------------------------------------- */
306
307struct hist_browser { 153struct hist_browser {
308 struct ui_browser b; 154 struct ui_browser b;
309 struct hists *hists; 155 struct hists *hists;
diff --git a/tools/perf/util/ui/browsers/map.c b/tools/perf/util/ui/browsers/map.c
new file mode 100644
index 000000000000..b79f0c996ea8
--- /dev/null
+++ b/tools/perf/util/ui/browsers/map.c
@@ -0,0 +1,163 @@
1#include "../libslang.h"
2#include <elf.h>
3#include <newt.h>
4#include <sys/ttydefaults.h>
5#include <ctype.h>
6#include <string.h>
7#include <linux/bitops.h>
8#include "../../debug.h"
9#include "../../symbol.h"
10#include "../browser.h"
11#include "../helpline.h"
12#include "map.h"
13
14static int ui_entry__read(const char *title, char *bf, size_t size, int width)
15{
16 struct newtExitStruct es;
17 newtComponent form, entry;
18 const char *result;
19 int err = -1;
20
21 newtCenteredWindow(width, 1, title);
22 form = newtForm(NULL, NULL, 0);
23 if (form == NULL)
24 return -1;
25
26 entry = newtEntry(0, 0, "0x", width, &result, NEWT_FLAG_SCROLL);
27 if (entry == NULL)
28 goto out_free_form;
29
30 newtFormAddComponent(form, entry);
31 newtFormAddHotKey(form, NEWT_KEY_ENTER);
32 newtFormAddHotKey(form, NEWT_KEY_ESCAPE);
33 newtFormAddHotKey(form, NEWT_KEY_LEFT);
34 newtFormAddHotKey(form, CTRL('c'));
35 newtFormRun(form, &es);
36
37 if (result != NULL) {
38 strncpy(bf, result, size);
39 err = 0;
40 }
41out_free_form:
42 newtPopWindow();
43 newtFormDestroy(form);
44 return 0;
45}
46
47struct map_browser {
48 struct ui_browser b;
49 struct map *map;
50 u16 namelen;
51 u8 addrlen;
52};
53
54static void map_browser__write(struct ui_browser *self, void *nd, int row)
55{
56 struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
57 struct map_browser *mb = container_of(self, struct map_browser, b);
58 bool current_entry = ui_browser__is_current_entry(self, row);
59 int color = ui_browser__percent_color(0, current_entry);
60
61 SLsmg_set_color(color);
62 slsmg_printf("%*llx %*llx %c ",
63 mb->addrlen, sym->start, mb->addrlen, sym->end,
64 sym->binding == STB_GLOBAL ? 'g' :
65 sym->binding == STB_LOCAL ? 'l' : 'w');
66 slsmg_write_nstring(sym->name, mb->namelen);
67}
68
69/* FIXME uber-kludgy, see comment on cmd_report... */
70static u32 *symbol__browser_index(struct symbol *self)
71{
72 return ((void *)self) - sizeof(struct rb_node) - sizeof(u32);
73}
74
75static int map_browser__search(struct map_browser *self)
76{
77 char target[512];
78 struct symbol *sym;
79 int err = ui_entry__read("Search by name/addr", target, sizeof(target), 40);
80
81 if (err)
82 return err;
83
84 if (target[0] == '0' && tolower(target[1]) == 'x') {
85 u64 addr = strtoull(target, NULL, 16);
86 sym = map__find_symbol(self->map, addr, NULL);
87 } else
88 sym = map__find_symbol_by_name(self->map, target, NULL);
89
90 if (sym != NULL) {
91 u32 *idx = symbol__browser_index(sym);
92
93 self->b.top = &sym->rb_node;
94 self->b.index = self->b.top_idx = *idx;
95 } else
96 ui_helpline__fpush("%s not found!", target);
97
98 return 0;
99}
100
101static int map_browser__run(struct map_browser *self, struct newtExitStruct *es)
102{
103 if (ui_browser__show(&self->b, self->map->dso->long_name) < 0)
104 return -1;
105
106 ui_helpline__fpush("Press <- or ESC to exit, %s / to search",
107 verbose ? "" : "restart with -v to use");
108 newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
109 newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);
110 if (verbose)
111 newtFormAddHotKey(self->b.form, '/');
112
113 while (1) {
114 ui_browser__run(&self->b, es);
115
116 if (es->reason != NEWT_EXIT_HOTKEY)
117 break;
118 if (verbose && es->u.key == '/')
119 map_browser__search(self);
120 else
121 break;
122 }
123
124 newtFormDestroy(self->b.form);
125 newtPopWindow();
126 ui_helpline__pop();
127 return 0;
128}
129
130int map__browse(struct map *self)
131{
132 struct map_browser mb = {
133 .b = {
134 .entries = &self->dso->symbols[self->type],
135 .refresh = ui_browser__rb_tree_refresh,
136 .seek = ui_browser__rb_tree_seek,
137 .write = map_browser__write,
138 },
139 .map = self,
140 };
141 struct newtExitStruct es;
142 struct rb_node *nd;
143 char tmp[BITS_PER_LONG / 4];
144 u64 maxaddr = 0;
145
146 for (nd = rb_first(mb.b.entries); nd; nd = rb_next(nd)) {
147 struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
148
149 if (mb.namelen < pos->namelen)
150 mb.namelen = pos->namelen;
151 if (maxaddr < pos->end)
152 maxaddr = pos->end;
153 if (verbose) {
154 u32 *idx = symbol__browser_index(pos);
155 *idx = mb.b.nr_entries;
156 }
157 ++mb.b.nr_entries;
158 }
159
160 mb.addrlen = snprintf(tmp, sizeof(tmp), "%llx", maxaddr);
161 mb.b.width += mb.addrlen * 2 + 4 + mb.namelen;
162 return map_browser__run(&mb, &es);
163}
diff --git a/tools/perf/util/ui/browsers/map.h b/tools/perf/util/ui/browsers/map.h
new file mode 100644
index 000000000000..df8581a43e17
--- /dev/null
+++ b/tools/perf/util/ui/browsers/map.h
@@ -0,0 +1,6 @@
1#ifndef _PERF_UI_MAP_BROWSER_H_
2#define _PERF_UI_MAP_BROWSER_H_ 1
3struct map;
4
5int map__browse(struct map *self);
6#endif /* _PERF_UI_MAP_BROWSER_H_ */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-13 23:34:00 -0500