From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756350AbaGORwC (ORCPT ); Tue, 15 Jul 2014 13:52:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:35101 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752103AbaGORv7 (ORCPT ); Tue, 15 Jul 2014 13:51:59 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,667,1400050800"; d="scan'208";a="573562925" Message-ID: <53C56A3B.7060702@intel.com> Date: Tue, 15 Jul 2014 20:51:55 +0300 From: Adrian Hunter User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Arnaldo Carvalho de Melo CC: Peter Zijlstra , linux-kernel@vger.kernel.org, David Ahern , Frederic Weisbecker , Jiri Olsa , Namhyung Kim , Paul Mackerras , Stephane Eranian Subject: Re: [PATCH 15/41] perf script: Improve srcline display for BTS References: <1405332185-4050-1-git-send-email-adrian.hunter@intel.com> <1405332185-4050-16-git-send-email-adrian.hunter@intel.com> <20140715141635.GA3301@kernel.org> In-Reply-To: <20140715141635.GA3301@kernel.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15/07/2014 5:16 p.m., Arnaldo Carvalho de Melo wrote: > Em Mon, Jul 14, 2014 at 01:02:39PM +0300, Adrian Hunter escreveu: >> 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 > > David, > > Can I have your acked-by? > > Adrian, > > Can you elaborate on why this is an improvement? It puts the branch 'from address' and 'to address' on the same line, which is how it would be without the source line reference. So it makes it consistent and much easier to read. > > - Arnaldo > >> Signed-off-by: Adrian Hunter >> --- >> 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