lkml.org 
[lkml]   [2016]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Initialize libapi debug output
    Commit-ID:  dd629cc0975349c99d5483402bca1ef16313c209
    Gitweb: http://git.kernel.org/tip/dd629cc0975349c99d5483402bca1ef16313c209
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Sun, 14 Feb 2016 17:03:45 +0100
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Tue, 16 Feb 2016 17:12:59 -0300

    perf tools: Initialize libapi debug output

    Setting libapi debug output functions to use perf functions.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1455465826-8426-5-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    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 a929618..144047c 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 d6c8d2b..ff7e86a 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"
    @@ -187,3 +188,23 @@ int perf_debug_option(const char *str)
    free(s);
    return 0;
    }
    +
    +#define DEBUG_WRAPPER(__n, __l) \
    +static int pr_ ## __n ## _wrapper(const char *fmt, ...) \
    +{ \
    + va_list args; \
    + int ret; \
    + \
    + va_start(args, fmt); \
    + ret = veprintf(__l, verbose, fmt, args); \
    + va_end(args); \
    + return ret; \
    +}
    +
    +DEBUG_WRAPPER(warning, 0);
    +DEBUG_WRAPPER(debug, 1);
    +
    +void perf_debug_setup(void)
    +{
    + libapi_set_print(pr_warning_wrapper, pr_warning_wrapper, pr_debug_wrapper);
    +}
    diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
    index 8b9a088..14bafda 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 */
    \
     
     \ /
      Last update: 2016-02-17 13:41    [W:2.480 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site