From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 4/5] perf tools: Initialize libapi debug output
Date: Sun, 14 Feb 2016 17:03:45 +0100 [thread overview]
Message-ID: <1455465826-8426-5-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1455465826-8426-1-git-send-email-jolsa@kernel.org>
Setting libapi debug output functions
to use perf functions.
Link: http://lkml.kernel.org/n/tip-apyen6qfzzwkqjhi1tzv72ju@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/perf.c | 2 ++
tools/perf/util/debug.c | 21 +++++++++++++++++++++
tools/perf/util/debug.h | 1 +
3 files changed, 24 insertions(+)
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index a929618b8eb6..144047c396f0 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -613,6 +613,8 @@ int main(int argc, const char **argv)
*/
pthread__block_sigwinch();
+ perf_debug_setup();
+
while (1) {
static int done_help;
int was_alias = run_argv(&argc, &argv);
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 86d9c7302598..152c2e32975f 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -5,6 +5,7 @@
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
+#include <api/debug.h>
#include "cache.h"
#include "color.h"
@@ -192,3 +193,23 @@ int perf_debug_option(const char *str)
free(s);
return 0;
}
+
+#define FUNC(__n, __l) \
+static int pr_ ## __n ## _func(const char *fmt, ...) \
+{ \
+ va_list args; \
+ int ret; \
+ \
+ va_start(args, fmt); \
+ ret = _eprintf(__l, verbose, fmt, args); \
+ va_end(args); \
+ return ret; \
+}
+
+FUNC(warning, 0);
+FUNC(debug, 1);
+
+void perf_debug_setup(void)
+{
+ libapi_set_print(pr_warning_func, pr_warning_func, pr_debug_func);
+}
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
index 8b9a088c32ab..14bafda79eda 100644
--- a/tools/perf/util/debug.h
+++ b/tools/perf/util/debug.h
@@ -53,5 +53,6 @@ int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __attribute__(
int veprintf(int level, int var, const char *fmt, va_list args);
int perf_debug_option(const char *str);
+void perf_debug_setup(void);
#endif /* __PERF_DEBUG_H */
--
2.4.3
next prev parent reply other threads:[~2016-02-14 16:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-14 16:03 [PATCH 0/5] perf tools: Store CPU cache details under perf data Jiri Olsa
2016-02-14 16:03 ` [PATCH 1/5] tools lib api: Add debug output support Jiri Olsa
2016-02-17 12:07 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-02-14 16:03 ` [PATCH 2/5] tools lib api fs: Move filename__read_str into api/fs/fs.c Jiri Olsa
2016-02-17 12:07 ` [tip:perf/core] tools lib api fs: Adopt filename__read_str from perf tip-bot for Jiri Olsa
2016-02-14 16:03 ` [PATCH 3/5] tools lib api fs: Add sysfs__read_str function Jiri Olsa
2016-02-17 12:07 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-02-14 16:03 ` Jiri Olsa [this message]
2016-02-17 12:08 ` [tip:perf/core] perf tools: Initialize libapi debug output tip-bot for Jiri Olsa
2016-02-14 16:03 ` [PATCH 5/5] perf tools: Add perf data cache feature Jiri Olsa
2016-02-16 12:11 ` [PATCHv2 " Jiri Olsa
2016-02-16 14:22 ` Namhyung Kim
2016-02-16 15:01 ` [PATCHv3 " Jiri Olsa
2016-02-16 15:29 ` Arnaldo Carvalho de Melo
2016-02-16 15:48 ` Arnaldo Carvalho de Melo
2016-02-17 12:08 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-02-16 8:14 ` [PATCH 0/5] perf tools: Store CPU cache details under perf data Ingo Molnar
2016-02-16 11:28 ` 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=1455465826-8426-5-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).