lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/52] perf script: Improve srcline display for BTS
    Date
    Change the order of the output to put the srcline last.
    e.g. old format:

    4028fc main+0x2c (/bin/ls)
    /build/buildd/coreutils-8.20/src/ls.c:1269 => 40d8a0 set_program_name+0x0 (/bin/ls)

    new format:

    4028fc main+0x2c (/bin/ls) => 40d8a0 set_program_name+0x0 (/bin/ls)
    /build/buildd/coreutils-8.20/src/ls.c:1269

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/builtin-script.c | 20 +++++++++++++++-----
    1 file changed, 15 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
    index 9e9c91f..333b15e 100644
    --- a/tools/perf/builtin-script.c
    +++ b/tools/perf/builtin-script.c
    @@ -427,15 +427,22 @@ static void print_sample_bts(union perf_event *event,
    struct addr_location *al)
    {
    struct perf_event_attr *attr = &evsel->attr;
    + bool print_srcline_last = false;

    /* print branch_from information */
    if (PRINT_FIELD(IP)) {
    - if (!symbol_conf.use_callchain)
    - printf(" ");
    - else
    + unsigned int print_opts = output[attr->type].print_ip_opts;
    +
    + if (symbol_conf.use_callchain && sample->callchain) {
    printf("\n");
    - perf_evsel__print_ip(evsel, sample, al,
    - output[attr->type].print_ip_opts,
    + } else {
    + printf(" ");
    + if (print_opts & PRINT_IP_OPT_SRCLINE) {
    + print_srcline_last = true;
    + print_opts &= ~PRINT_IP_OPT_SRCLINE;
    + }
    + }
    + perf_evsel__print_ip(evsel, sample, al, print_opts,
    PERF_MAX_STACK_DEPTH);
    }

    @@ -447,6 +454,9 @@ static void print_sample_bts(union perf_event *event,
    !output[attr->type].user_set))
    print_sample_addr(event, sample, al->machine, thread, attr);

    + if (print_srcline_last)
    + map__fprintf_srcline(al->map, al->addr, "\n ", stdout);
    +
    printf("\n");
    }

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-07-22 16:01    [W:4.422 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site