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

Commit c95688aa authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Factor eprintf to allow different debug variables 



This way we can easily reuse current debug functions for another debug
variables other than verbose.
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>

Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1405374411-29012-4-git-send-email-jolsa@kernel.org


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

tools/perf/util/debug.c

+6 −6
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
int verbose;

bool dump_trace = false, quiet = false;



static int _eprintf(int level, const char *fmt, va_list args)

static int _eprintf(int level, int var, const char *fmt, va_list args)

{

	int ret = 0;



	if (verbose >= level) {

	if (var >= level) {

		if (use_browser >= 1)

			ui_helpline__vshow(fmt, args);

		else
@@ -30,13 +30,13 @@ static int _eprintf(int level, const char *fmt, va_list args) 
	return ret;

}



int eprintf(int level, const char *fmt, ...)

int eprintf(int level, int var, const char *fmt, ...)

{

	va_list args;

	int ret;



	va_start(args, fmt);

	ret = _eprintf(level, fmt, args);

	ret = _eprintf(level, var, fmt, args);

	va_end(args);



	return ret;
@@ -51,9 +51,9 @@ void pr_stat(const char *fmt, ...) 
	va_list args;



	va_start(args, fmt);

	_eprintf(1, fmt, args);

	_eprintf(1, verbose, fmt, args);

	va_end(args);

	eprintf(1, "\n");

	eprintf(1, verbose, "\n");

}



int dump_printf(const char *fmt, ...)

tools/perf/util/debug.h

+6 −6
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ extern bool quiet, dump_trace; 
#endif



#define pr_err(fmt, ...) \

	eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)

	eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_warning(fmt, ...) \

	eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)

	eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_info(fmt, ...) \

	eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)

	eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug(fmt, ...) \

	eprintf(1, pr_fmt(fmt), ##__VA_ARGS__)

	eprintf(1, verbose, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debugN(n, fmt, ...) \

	eprintf(n, pr_fmt(fmt), ##__VA_ARGS__)

	eprintf(n, verbose, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug2(fmt, ...) pr_debugN(2, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug3(fmt, ...) pr_debugN(3, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug4(fmt, ...) pr_debugN(4, pr_fmt(fmt), ##__VA_ARGS__)
@@ -37,6 +37,6 @@ int ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2))); 


void pr_stat(const char *fmt, ...);



int eprintf(int level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));

int eprintf(int level, int var, const char *fmt, ...) __attribute__((format(printf, 3, 4)));



#endif	/* __PERF_DEBUG_H */

tools/perf/util/python.c

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
 */

int verbose;



int eprintf(int level, const char *fmt, ...)

int eprintf(int level, int var, const char *fmt, ...)

{

	va_list args;

	int ret = 0;



	if (verbose >= level) {

	if (var >= level) {

		va_start(args, fmt);

		ret = vfprintf(stderr, fmt, args);

		va_end(args);