From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH 2/5] perf tools: Move pr_* debug macros into debug object
Date: Thu, 17 Jul 2014 11:07:27 -0300 [thread overview]
Message-ID: <20140717140727.GC4312@kernel.org> (raw)
In-Reply-To: <1405374411-29012-3-git-send-email-jolsa@kernel.org>
Em Mon, Jul 14, 2014 at 11:46:48PM +0200, Jiri Olsa escreveu:
> Moving pr_* debug macros to have it with in same object as
> debug variables, becase we will change them to use verbose
> variable in next patch.
CC /home/acme/git/build/perf/ui/gtk/util.o
util/scripting-engines/trace-event-python.c: In function ‘python_process_callchain’:
util/scripting-engines/trace-event-python.c:299:3: error: implicit declaration of function ‘pr_err’ [-Werror=implicit-function-declaration]
util/scripting-engines/trace-event-python.c:299:3: error: nested extern declaration of ‘pr_err’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
make[1]: *** [/home/acme/git/build/perf/util/scripting-engines/trace-event-python.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [install] Error 2
make: Leaving directory `/home/acme/git/linux/tools/perf'
[acme@ssdandy linux]$
Nevermind, I'll fix it.
> Cc: Arnaldo Carvalho de Melo <acme@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>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/arch/x86/tests/dwarf-unwind.c | 1 +
> tools/perf/arch/x86/util/unwind-libunwind.c | 1 +
> tools/perf/builtin-evlist.c | 1 +
> tools/perf/builtin-help.c | 1 +
> tools/perf/builtin-timechart.c | 1 +
> tools/perf/tests/dso-data.c | 1 +
> tools/perf/tests/evsel-roundtrip-name.c | 1 +
> tools/perf/tests/evsel-tp-sched.c | 1 +
> tools/perf/tests/open-syscall-tp-fields.c | 1 +
> tools/perf/tests/parse-events.c | 1 +
> tools/perf/tests/parse-no-sample-id-all.c | 1 +
> tools/perf/tests/sample-parsing.c | 1 +
> tools/perf/tests/thread-mg-share.c | 1 +
> tools/perf/util/data.c | 1 +
> tools/perf/util/debug.h | 20 ++++++++++++++++++++
> tools/perf/util/include/linux/kernel.h | 21 ---------------------
> tools/perf/util/pstack.c | 1 +
> .../perf/util/scripting-engines/trace-event-perl.c | 1 +
> tools/perf/util/trace-event-info.c | 1 +
> tools/perf/util/trace-event-read.c | 1 +
> tools/perf/util/unwind-libunwind.c | 1 +
> tools/perf/util/util.c | 1 +
> tools/perf/util/vdso.c | 1 +
> 23 files changed, 41 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/arch/x86/tests/dwarf-unwind.c b/tools/perf/arch/x86/tests/dwarf-unwind.c
> index 9f89f899ccc7..d8bbf7ad1681 100644
> --- a/tools/perf/arch/x86/tests/dwarf-unwind.c
> +++ b/tools/perf/arch/x86/tests/dwarf-unwind.c
> @@ -3,6 +3,7 @@
> #include "thread.h"
> #include "map.h"
> #include "event.h"
> +#include "debug.h"
> #include "tests/tests.h"
>
> #define STACK_SIZE 8192
> diff --git a/tools/perf/arch/x86/util/unwind-libunwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c
> index 3261f68c6a7c..db25e93d989c 100644
> --- a/tools/perf/arch/x86/util/unwind-libunwind.c
> +++ b/tools/perf/arch/x86/util/unwind-libunwind.c
> @@ -3,6 +3,7 @@
> #include <libunwind.h>
> #include "perf_regs.h"
> #include "../../util/unwind.h"
> +#include "../../util/debug.h"
>
> #ifdef HAVE_ARCH_X86_64_SUPPORT
> int libunwind__arch_reg_id(int regnum)
> diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c
> index c99e0de7e54a..66e12f55c052 100644
> --- a/tools/perf/builtin-evlist.c
> +++ b/tools/perf/builtin-evlist.c
> @@ -15,6 +15,7 @@
> #include "util/parse-options.h"
> #include "util/session.h"
> #include "util/data.h"
> +#include "util/debug.h"
>
> static int __cmd_evlist(const char *file_name, struct perf_attr_details *details)
> {
> diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
> index 178b88ae3d2f..0384d930480b 100644
> --- a/tools/perf/builtin-help.c
> +++ b/tools/perf/builtin-help.c
> @@ -11,6 +11,7 @@
> #include "util/parse-options.h"
> #include "util/run-command.h"
> #include "util/help.h"
> +#include "util/debug.h"
>
> static struct man_viewer_list {
> struct man_viewer_list *next;
> diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
> index 04c9c53becad..2f1a5220c090 100644
> --- a/tools/perf/builtin-timechart.c
> +++ b/tools/perf/builtin-timechart.c
> @@ -37,6 +37,7 @@
> #include "util/svghelper.h"
> #include "util/tool.h"
> #include "util/data.h"
> +#include "util/debug.h"
>
> #define SUPPORT_OLD_POWER_EVENTS 1
> #define PWR_EVENT_EXIT -1
> diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
> index 630808cd7cc2..caaf37f079b1 100644
> --- a/tools/perf/tests/dso-data.c
> +++ b/tools/perf/tests/dso-data.c
> @@ -10,6 +10,7 @@
> #include "machine.h"
> #include "symbol.h"
> #include "tests.h"
> +#include "debug.h"
>
> static char *test_file(int size)
> {
> diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c
> index 465cdbc345cf..b8d8341b383e 100644
> --- a/tools/perf/tests/evsel-roundtrip-name.c
> +++ b/tools/perf/tests/evsel-roundtrip-name.c
> @@ -2,6 +2,7 @@
> #include "evsel.h"
> #include "parse-events.h"
> #include "tests.h"
> +#include "debug.h"
>
> static int perf_evsel__roundtrip_cache_name_test(void)
> {
> diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
> index 35d7fdb2328d..52162425c969 100644
> --- a/tools/perf/tests/evsel-tp-sched.c
> +++ b/tools/perf/tests/evsel-tp-sched.c
> @@ -1,6 +1,7 @@
> #include <traceevent/event-parse.h>
> #include "evsel.h"
> #include "tests.h"
> +#include "debug.h"
>
> static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
> int size, bool should_be_signed)
> diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c
> index c505ef2af245..0785b64ffd6c 100644
> --- a/tools/perf/tests/open-syscall-tp-fields.c
> +++ b/tools/perf/tests/open-syscall-tp-fields.c
> @@ -3,6 +3,7 @@
> #include "evsel.h"
> #include "thread_map.h"
> #include "tests.h"
> +#include "debug.h"
>
> int test__syscall_open_tp_fields(void)
> {
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index deba66955f8c..5941927a4b7f 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -5,6 +5,7 @@
> #include <api/fs/fs.h>
> #include <api/fs/debugfs.h>
> #include "tests.h"
> +#include "debug.h"
> #include <linux/hw_breakpoint.h>
>
> #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
> diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/parse-no-sample-id-all.c
> index 905019f9b740..2c63ea658541 100644
> --- a/tools/perf/tests/parse-no-sample-id-all.c
> +++ b/tools/perf/tests/parse-no-sample-id-all.c
> @@ -7,6 +7,7 @@
> #include "evlist.h"
> #include "header.h"
> #include "util.h"
> +#include "debug.h"
>
> static int process_event(struct perf_evlist **pevlist, union perf_event *event)
> {
> diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
> index 7ae8d17db3d9..ca292f9a4ae2 100644
> --- a/tools/perf/tests/sample-parsing.c
> +++ b/tools/perf/tests/sample-parsing.c
> @@ -4,6 +4,7 @@
> #include "util.h"
> #include "event.h"
> #include "evsel.h"
> +#include "debug.h"
>
> #include "tests.h"
>
> diff --git a/tools/perf/tests/thread-mg-share.c b/tools/perf/tests/thread-mg-share.c
> index 2b2e0dbe114f..b028499dd3cf 100644
> --- a/tools/perf/tests/thread-mg-share.c
> +++ b/tools/perf/tests/thread-mg-share.c
> @@ -2,6 +2,7 @@
> #include "machine.h"
> #include "thread.h"
> #include "map.h"
> +#include "debug.h"
>
> int test__thread_mg_share(void)
> {
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 55de44ecebef..34cc8fe8852b 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -7,6 +7,7 @@
>
> #include "data.h"
> #include "util.h"
> +#include "debug.h"
>
> static bool check_pipe(struct perf_data_file *file)
> {
> diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
> index 443694c36b03..8a8ceb3ccde9 100644
> --- a/tools/perf/util/debug.h
> +++ b/tools/perf/util/debug.h
> @@ -11,6 +11,24 @@
> extern int verbose;
> extern bool quiet, dump_trace;
>
> +#ifndef pr_fmt
> +#define pr_fmt(fmt) fmt
> +#endif
> +
> +#define pr_err(fmt, ...) \
> + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> +#define pr_warning(fmt, ...) \
> + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> +#define pr_info(fmt, ...) \
> + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> +#define pr_debug(fmt, ...) \
> + eprintf(1, pr_fmt(fmt), ##__VA_ARGS__)
> +#define pr_debugN(n, fmt, ...) \
> + eprintf(n, 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__)
> +
> int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
> void trace_event(union perf_event *event);
>
> @@ -19,4 +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)));
> +
> #endif /* __PERF_DEBUG_H */
> diff --git a/tools/perf/util/include/linux/kernel.h b/tools/perf/util/include/linux/kernel.h
> index 9844c31b7c2b..09e8e7aea7c6 100644
> --- a/tools/perf/util/include/linux/kernel.h
> +++ b/tools/perf/util/include/linux/kernel.h
> @@ -94,27 +94,6 @@ static inline int scnprintf(char * buf, size_t size, const char * fmt, ...)
> return (i >= ssize) ? (ssize - 1) : i;
> }
>
> -int eprintf(int level,
> - const char *fmt, ...) __attribute__((format(printf, 2, 3)));
> -
> -#ifndef pr_fmt
> -#define pr_fmt(fmt) fmt
> -#endif
> -
> -#define pr_err(fmt, ...) \
> - eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> -#define pr_warning(fmt, ...) \
> - eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> -#define pr_info(fmt, ...) \
> - eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
> -#define pr_debug(fmt, ...) \
> - eprintf(1, pr_fmt(fmt), ##__VA_ARGS__)
> -#define pr_debugN(n, fmt, ...) \
> - eprintf(n, 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__)
> -
> /*
> * This looks more complex than it should be. But we need to
> * get the type for the ~ right in round_down (it needs to be
> diff --git a/tools/perf/util/pstack.c b/tools/perf/util/pstack.c
> index daa17aeb6c63..a126e6cc6e73 100644
> --- a/tools/perf/util/pstack.c
> +++ b/tools/perf/util/pstack.c
> @@ -6,6 +6,7 @@
>
> #include "util.h"
> #include "pstack.h"
> +#include "debug.h"
> #include <linux/kernel.h>
> #include <stdlib.h>
>
> diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
> index af7da565a750..b2dba9c0a3a1 100644
> --- a/tools/perf/util/scripting-engines/trace-event-perl.c
> +++ b/tools/perf/util/scripting-engines/trace-event-perl.c
> @@ -34,6 +34,7 @@
> #include "../event.h"
> #include "../trace-event.h"
> #include "../evsel.h"
> +#include "../debug.h"
>
> void boot_Perf__Trace__Context(pTHX_ CV *cv);
> void boot_DynaLoader(pTHX_ CV *cv);
> diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
> index 7e6fcfe8b438..a92d2437f3ee 100644
> --- a/tools/perf/util/trace-event-info.c
> +++ b/tools/perf/util/trace-event-info.c
> @@ -40,6 +40,7 @@
> #include "trace-event.h"
> #include <api/fs/debugfs.h>
> #include "evsel.h"
> +#include "debug.h"
>
> #define VERSION "0.5"
>
> diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
> index e113e180c48f..ea3fd7fc6f5c 100644
> --- a/tools/perf/util/trace-event-read.c
> +++ b/tools/perf/util/trace-event-read.c
> @@ -36,6 +36,7 @@
> #include "../perf.h"
> #include "util.h"
> #include "trace-event.h"
> +#include "debug.h"
>
> static int input_fd;
>
> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> index 25578b98f5c5..92b56db52471 100644
> --- a/tools/perf/util/unwind-libunwind.c
> +++ b/tools/perf/util/unwind-libunwind.c
> @@ -30,6 +30,7 @@
> #include "unwind.h"
> #include "symbol.h"
> #include "util.h"
> +#include "debug.h"
>
> extern int
> UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
> index 95aefa78bb07..7d9a1e97ce8c 100644
> --- a/tools/perf/util/util.c
> +++ b/tools/perf/util/util.c
> @@ -1,5 +1,6 @@
> #include "../perf.h"
> #include "util.h"
> +#include "debug.h"
> #include <api/fs/fs.h>
> #include <sys/mman.h>
> #ifdef HAVE_BACKTRACE_SUPPORT
> diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
> index 0ddb3b8a89ec..290582452da3 100644
> --- a/tools/perf/util/vdso.c
> +++ b/tools/perf/util/vdso.c
> @@ -12,6 +12,7 @@
> #include "util.h"
> #include "symbol.h"
> #include "linux/string.h"
> +#include "debug.h"
>
> static bool vdso_found;
> static char vdso_file[] = "/tmp/perf-vdso.so-XXXXXX";
> --
> 1.8.3.1
next prev parent reply other threads:[~2014-07-17 14:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 21:46 [PATCHv2 0/4] perf tools: Add support for more debug variables Jiri Olsa
2014-07-14 21:46 ` [PATCH 1/5] perf tools: Remove verbose from functions prototypes Jiri Olsa
2014-07-18 4:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-07-14 21:46 ` [PATCH 2/5] perf tools: Move pr_* debug macros into debug object Jiri Olsa
2014-07-17 14:07 ` Arnaldo Carvalho de Melo [this message]
2014-07-18 4:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-07-14 21:46 ` [PATCH 3/5] perf tools: Factor eprintf to allow different debug variables Jiri Olsa
2014-07-18 4:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-07-14 21:46 ` [PATCH 4/5] perf tools: Add --debug optionto set debug variable Jiri Olsa
2014-07-17 8:15 ` Namhyung Kim
2014-07-17 10:55 ` [PATCHv3 " Jiri Olsa
2014-07-18 4:28 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-07-18 5:04 ` [PATCHv3 4/5] " Namhyung Kim
2014-07-18 6:57 ` Jiri Olsa
2014-07-14 21:46 ` [PATCH 5/5] perf tools: Remove getopt.h includes Jiri Olsa
2014-07-18 4:28 ` [tip:perf/core] perf tools: Remove needless " tip-bot for Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140717140727.GC4312@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.