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

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

perf ui: Always compile error printing code 



It is used everywhere so always build it regardless of ui engine.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1352911664-24620-2-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 919d590f

tools/perf/Makefile

+5 −9
Original line number Diff line number Diff line
@@ -378,8 +378,11 @@ LIB_H += util/rblist.h 
LIB_H += util/intlist.h

LIB_H += util/perf_regs.h

LIB_H += util/unwind.h

LIB_H += ui/helpline.h

LIB_H += util/vdso.h

LIB_H += ui/helpline.h

LIB_H += ui/progress.h

LIB_H += ui/util.h

LIB_H += ui/ui.h



LIB_OBJS += $(OUTPUT)util/abspath.o

LIB_OBJS += $(OUTPUT)util/alias.o
@@ -453,6 +456,7 @@ LIB_OBJS += $(OUTPUT)util/stat.o 
LIB_OBJS += $(OUTPUT)ui/setup.o

LIB_OBJS += $(OUTPUT)ui/helpline.o

LIB_OBJS += $(OUTPUT)ui/progress.o

LIB_OBJS += $(OUTPUT)ui/util.o

LIB_OBJS += $(OUTPUT)ui/hist.o

LIB_OBJS += $(OUTPUT)ui/stdio/hist.o
@@ -646,7 +650,6 @@ ifndef NO_NEWT 
		LIB_OBJS += $(OUTPUT)ui/browsers/hists.o

		LIB_OBJS += $(OUTPUT)ui/browsers/map.o

		LIB_OBJS += $(OUTPUT)ui/browsers/scripts.o

		LIB_OBJS += $(OUTPUT)ui/util.o

		LIB_OBJS += $(OUTPUT)ui/tui/setup.o

		LIB_OBJS += $(OUTPUT)ui/tui/util.o

		LIB_OBJS += $(OUTPUT)ui/tui/helpline.o
@@ -655,9 +658,6 @@ ifndef NO_NEWT 
		LIB_H += ui/browsers/map.h

		LIB_H += ui/keysyms.h

		LIB_H += ui/libslang.h

		LIB_H += ui/progress.h

		LIB_H += ui/util.h

		LIB_H += ui/ui.h

	endif

endif
@@ -677,10 +677,6 @@ ifndef NO_GTK2 
		LIB_OBJS += $(OUTPUT)ui/gtk/util.o

		LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o

		LIB_OBJS += $(OUTPUT)ui/gtk/progress.o

		# Make sure that it'd be included only once.

		ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),)

			LIB_OBJS += $(OUTPUT)ui/util.o

		endif

	endif

endif

tools/perf/ui/util.c

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,16 @@ int ui__warning(const char *format, ...) 
	return ret;

}



int ui__error_paranoid(void)

{

	return ui__error("Permission error - are you root?\n"

		    "Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n"

		    " -1 - Not paranoid at all\n"

		    "  0 - Disallow raw tracepoint access for unpriv\n"

		    "  1 - Disallow cpu events for unpriv\n"

		    "  2 - Disallow kernel profiling for unpriv\n");

}





/**

 * perf_error__register - Register error logging functions

tools/perf/util/debug.c

+0 −22
Original line number Diff line number Diff line
@@ -49,28 +49,6 @@ int dump_printf(const char *fmt, ...) 
	return ret;

}



#if !defined(NEWT_SUPPORT) && !defined(GTK2_SUPPORT)

int ui__warning(const char *format, ...)

{

	va_list args;



	va_start(args, format);

	vfprintf(stderr, format, args);

	va_end(args);

	return 0;

}

#endif



int ui__error_paranoid(void)

{

	return ui__error("Permission error - are you root?\n"

		    "Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n"

		    " -1 - Not paranoid at all\n"

		    "  0 - Disallow raw tracepoint access for unpriv\n"

		    "  1 - Disallow cpu events for unpriv\n"

		    "  2 - Disallow kernel profiling for unpriv\n");

}



void trace_event(union perf_event *event)

{

	unsigned char *raw_event = (void *)event;

tools/perf/util/debug.h

+2 −31
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <stdbool.h>

#include "event.h"

#include "../ui/helpline.h"

#include "../ui/progress.h"

#include "../ui/util.h"



extern int verbose;

extern bool quiet, dump_trace;
@@ -12,38 +14,7 @@ extern bool quiet, dump_trace; 
int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));

void trace_event(union perf_event *event);



struct ui_progress;

struct perf_error_ops;



#if defined(NEWT_SUPPORT) || defined(GTK2_SUPPORT)



#include "../ui/progress.h"

int ui__error(const char *format, ...) __attribute__((format(printf, 1, 2)));

#include "../ui/util.h"



#else



static inline void ui_progress__update(u64 curr __maybe_unused,

				       u64 total __maybe_unused,

				       const char *title __maybe_unused) {}

static inline void ui_progress__finish(void) {}



#define ui__error(format, arg...) ui__warning(format, ##arg)



static inline int

perf_error__register(struct perf_error_ops *eops __maybe_unused)

{

	return 0;

}



static inline int

perf_error__unregister(struct perf_error_ops *eops __maybe_unused)

{

	return 0;

}



#endif /* NEWT_SUPPORT || GTK2_SUPPORT */



int ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));

int ui__error_paranoid(void);