lkml.org 
[lkml]   [2011]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] perf report: Use ui__warning in some more places
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    So that we get a proper warning in the TUI in cases like:

    $ perf report --stdio -g fractal,0.5,caller --sort pid
    Selected -g but no callchain data. Did you call 'perf record' without -g?
    $

    The --stdio case is ok because it uses fprintf, ui__warning is needed to
    figure out if --stdio or --tui is being used.

    Cc: Arun Sharma <asharma@fb.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Sam Liao <phyomh@gmail.com>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-ag9fz2wd17mbbfjsbznq1wms@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-report.c | 15 +++++++--------
    1 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index f854efd..d7ff277 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -162,23 +162,22 @@ static int perf_session__setup_sample_type(struct perf_session *self)
    {
    if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
    if (sort__has_parent) {
    - fprintf(stderr, "selected --sort parent, but no"
    - " callchain data. Did you call"
    - " perf record without -g?\n");
    + ui__warning("Selected --sort parent, but no "
    + "callchain data. Did you call "
    + "'perf record' without -g?\n");
    return -EINVAL;
    }
    if (symbol_conf.use_callchain) {
    - fprintf(stderr, "selected -g but no callchain data."
    - " Did you call perf record without"
    - " -g?\n");
    + ui__warning("Selected -g but no callchain data. Did "
    + "you call 'perf record' without -g?\n");
    return -1;
    }
    } else if (!dont_use_callchains && callchain_param.mode != CHAIN_NONE &&
    !symbol_conf.use_callchain) {
    symbol_conf.use_callchain = true;
    if (callchain_register_param(&callchain_param) < 0) {
    - fprintf(stderr, "Can't register callchain"
    - " params\n");
    + ui__warning("Can't register callchain "
    + "params.\n");
    return -EINVAL;
    }
    }
    --
    1.6.2.5


    \
     
     \ /
      Last update: 2011-08-04 16:59    [W:0.028 / U:1.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site