diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2012-08-16 17:14:54 +0900 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-08-17 12:37:56 -0300 |
| commit | 0985a94891c73740dea1e2697f9d598a4a7810ab (patch) | |
| tree | 6cf8ceff2dad3e1f36415885c0aaf2e00f4a20cb /tools/perf/ui/gtk | |
| parent | ed70c609ae92e0cb03b746ab566c3cf8f2aaede4 (diff) | |
| download | linux-3.10-0985a94891c73740dea1e2697f9d598a4a7810ab.tar.gz linux-3.10-0985a94891c73740dea1e2697f9d598a4a7810ab.tar.bz2 linux-3.10-0985a94891c73740dea1e2697f9d598a4a7810ab.zip | |
perf ui gtk: Add perf_gtk__show_helpline() for pr_*
Use helpline for printing error/debug messages. The code resembles a TUI
counter part and only print the first line of the message.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1345104894-14205-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/ui/gtk')
| -rw-r--r-- | tools/perf/ui/gtk/helpline.c | 26 | ||||
| -rw-r--r-- | tools/perf/ui/gtk/util.c | 5 |
2 files changed, 26 insertions, 5 deletions
diff --git a/tools/perf/ui/gtk/helpline.c b/tools/perf/ui/gtk/helpline.c index 2511b374679..5db4432ff12 100644 --- a/tools/perf/ui/gtk/helpline.c +++ b/tools/perf/ui/gtk/helpline.c @@ -1,5 +1,10 @@ +#include <stdio.h> +#include <string.h> + #include "gtk.h" +#include "../ui.h" #include "../helpline.h" +#include "../../util/debug.h" static void gtk_helpline_pop(void) { @@ -28,3 +33,24 @@ void perf_gtk__init_helpline(void) { helpline_fns = >k_helpline_fns; } + +int perf_gtk__show_helpline(const char *fmt, va_list ap) +{ + int ret; + char *ptr; + static int backlog; + + ret = vscnprintf(ui_helpline__current + backlog, + sizeof(ui_helpline__current) - backlog, fmt, ap); + backlog += ret; + + /* only first line can be displayed */ + ptr = strchr(ui_helpline__current, '\n'); + if (ptr && (ptr - ui_helpline__current) <= backlog) { + *ptr = '\0'; + ui_helpline__puts(ui_helpline__current); + backlog = 0; + } + + return ret; +} diff --git a/tools/perf/ui/gtk/util.c b/tools/perf/ui/gtk/util.c index 0ead373c0df..b8efb966f94 100644 --- a/tools/perf/ui/gtk/util.c +++ b/tools/perf/ui/gtk/util.c @@ -117,11 +117,6 @@ struct perf_error_ops perf_gtk_eops = { * For now, just add stubs for NO_NEWT=1 build. */ #ifdef NO_NEWT_SUPPORT -int ui_helpline__show_help(const char *format __used, va_list ap __used) -{ - return 0; -} - void ui_progress__update(u64 curr __used, u64 total __used, const char *title __used) { |