Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0985a948 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarPekka 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ed70c609

tools/perf/ui/gtk/helpline.c

+26 −0
Original line number Diff line number Diff line 
#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 = &gtk_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;

}

tools/perf/ui/gtk/util.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

{

tools/perf/ui/helpline.h

+23 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include <stdio.h>

#include <stdarg.h>



#include "../util/cache.h"



struct ui_helpline {

	void (*pop)(void);

	void (*push)(const char *msg);
@@ -21,4 +23,25 @@ void ui_helpline__puts(const char *msg); 


extern char ui_helpline__current[512];



#ifdef NO_NEWT_SUPPORT

static inline int ui_helpline__show_help(const char *format __used,

					 va_list ap __used)

{

	return 0;

}

#else

extern char ui_helpline__last_msg[];

int ui_helpline__show_help(const char *format, va_list ap);

#endif /* NO_NEWT_SUPPORT */



#ifdef NO_GTK2_SUPPORT

static inline int perf_gtk__show_helpline(const char *format __used,

					  va_list ap __used)

{

	return 0;

}

#else

int perf_gtk__show_helpline(const char *format, va_list ap);

#endif /* NO_GTK2_SUPPORT */



#endif /* _PERF_UI_HELPLINE_H_ */

tools/perf/ui/setup.c

+4 −0
Original line number Diff line number Diff line 
#include <pthread.h>



#include "../cache.h"

#include "../debug.h"





pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;



void setup_browser(bool fallback_to_pager)

{

	if (!isatty(1) || dump_trace)

tools/perf/ui/tui/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#include "../libslang.h"

#include "../keysyms.h"



pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;



static volatile int ui__need_resize;



extern struct perf_error_ops perf_tui_eops;