lkml.org 
[lkml]   [2010]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/5] perf tools: Use eprintf for pr_{err,warning,info} too
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Just like we do for pr_debug, so that we can have a single point where to
    redirect to the currently used output system, be it stdio or newt.

    Cc: Frédéric Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/debug.h | 2 --
    tools/perf/util/include/linux/kernel.h | 9 ++++++---
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
    index c6c24c5..58720a1 100644
    --- a/tools/perf/util/debug.h
    +++ b/tools/perf/util/debug.h
    @@ -7,8 +7,6 @@
    extern int verbose;
    extern int dump_trace;

    -int eprintf(int level,
    - const char *fmt, ...) __attribute__((format(printf, 2, 3)));
    int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
    void trace_event(event_t *event);

    diff --git a/tools/perf/util/include/linux/kernel.h b/tools/perf/util/include/linux/kernel.h
    index f261165..388ab1b 100644
    --- a/tools/perf/util/include/linux/kernel.h
    +++ b/tools/perf/util/include/linux/kernel.h
    @@ -85,16 +85,19 @@ simple_strtoul(const char *nptr, char **endptr, int base)
    return strtoul(nptr, endptr, base);
    }

    +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, ...) \
    - do { fprintf(stderr, pr_fmt(fmt), ##__VA_ARGS__); } while (0)
    + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
    #define pr_warning(fmt, ...) \
    - do { fprintf(stderr, pr_fmt(fmt), ##__VA_ARGS__); } while (0)
    + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
    #define pr_info(fmt, ...) \
    - do { fprintf(stderr, pr_fmt(fmt), ##__VA_ARGS__); } while (0)
    + eprintf(0, pr_fmt(fmt), ##__VA_ARGS__)
    #define pr_debug(fmt, ...) \
    eprintf(1, pr_fmt(fmt), ##__VA_ARGS__)
    #define pr_debugN(n, fmt, ...) \
    --
    1.6.2.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-03-12 00:15    [W:0.049 / U:122.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site