diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-26 06:00:55 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-26 11:06:36 -0400 |
commit | ae55795ef2d9ba71d46e4111b87a4d0cde93abea (patch) | |
tree | dcd1afdaa5942cb661774f4c4b96353327ae1f28 /tools/perf/util/ui/browsers | |
parent | 1056d3dd9416740ec7d31348ca5f55009dc06bf3 (diff) |
perf ui: Reimplement the popup windows using libslang
Just another step in stopping the use of libnewt in perf.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.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-vtxnmz1t1807ykprapnk9njl@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/ui/browsers')
-rw-r--r-- | tools/perf/util/ui/browsers/annotate.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c index 4e0cb7fea7d9..0575905d1205 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/util/ui/browsers/annotate.c | |||
@@ -1,6 +1,9 @@ | |||
1 | #include "../../util.h" | ||
1 | #include "../browser.h" | 2 | #include "../browser.h" |
2 | #include "../helpline.h" | 3 | #include "../helpline.h" |
3 | #include "../libslang.h" | 4 | #include "../libslang.h" |
5 | #include "../ui.h" | ||
6 | #include "../util.h" | ||
4 | #include "../../annotate.h" | 7 | #include "../../annotate.h" |
5 | #include "../../hist.h" | 8 | #include "../../hist.h" |
6 | #include "../../sort.h" | 9 | #include "../../sort.h" |
@@ -8,15 +11,6 @@ | |||
8 | #include <pthread.h> | 11 | #include <pthread.h> |
9 | #include <newt.h> | 12 | #include <newt.h> |
10 | 13 | ||
11 | static void ui__error_window(const char *fmt, ...) | ||
12 | { | ||
13 | va_list ap; | ||
14 | |||
15 | va_start(ap, fmt); | ||
16 | newtWinMessagev((char *)"Error", (char *)"Ok", (char *)fmt, ap); | ||
17 | va_end(ap); | ||
18 | } | ||
19 | |||
20 | struct annotate_browser { | 14 | struct annotate_browser { |
21 | struct ui_browser b; | 15 | struct ui_browser b; |
22 | struct rb_root entries; | 16 | struct rb_root entries; |
@@ -400,7 +394,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, | |||
400 | return -1; | 394 | return -1; |
401 | 395 | ||
402 | if (symbol__annotate(sym, map, sizeof(struct objdump_line_rb_node)) < 0) { | 396 | if (symbol__annotate(sym, map, sizeof(struct objdump_line_rb_node)) < 0) { |
403 | ui__error_window(ui_helpline__last_msg); | 397 | ui__error("%s", ui_helpline__last_msg); |
404 | return -1; | 398 | return -1; |
405 | } | 399 | } |
406 | 400 | ||