Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751773AbdHGPVJ (ORCPT ); Mon, 7 Aug 2017 11:21:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:55674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375AbdHGPVD (ORCPT ); Mon, 7 Aug 2017 11:21:03 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1582622B6C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Mon, 7 Aug 2017 12:21:00 -0300 From: Arnaldo Carvalho de Melo To: Milian Wolff Cc: Jin Yao , Linux-kernel@vger.kernel.org, Namhyung Kim , linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , David Ahern , Peter Zijlstra Subject: Re: [PATCH v2 13/14] perf util: do not consider empty files as valid srclines Message-ID: <20170807152100.GS12201@kernel.org> References: <20170806212446.24925-1-milian.wolff@kdab.com> <20170806212446.24925-14-milian.wolff@kdab.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170806212446.24925-14-milian.wolff@kdab.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1714 Lines: 47 Em Sun, Aug 06, 2017 at 11:24:45PM +0200, Milian Wolff escreveu: > Sometimes we get a non-null, but empty, string for the filename from > bfd. This then results in srclines of the form ":0", which is > different from the canonical SRCLINE_UNKNOWN in the form "??:0". > Set the file to NULL if it is empty to fix this. I cherry picked this one now, i.e. looks useful even before looking at the other patches in depth. - Arnaldo > Cc: Arnaldo Carvalho de Melo > Cc: David Ahern > Cc: Namhyung Kim > Cc: Peter Zijlstra > Cc: Yao Jin > Signed-off-by: Milian Wolff > --- > tools/perf/util/srcline.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c > index 0c5ee741c515..7bf38b78a1ba 100644 > --- a/tools/perf/util/srcline.c > +++ b/tools/perf/util/srcline.c > @@ -168,6 +168,9 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) > a2l->found = bfd_find_nearest_line(abfd, section, a2l->syms, pc - vma, > &a2l->filename, &a2l->funcname, > &a2l->line); > + > + if (a2l->filename && !strlen(a2l->filename)) > + a2l->filename = NULL; > } > > static struct a2l_data *addr2line_init(const char *path) > @@ -297,6 +300,9 @@ static int addr2line(const char *dso_name, u64 addr, > &a2l->funcname, &a2l->line) && > cnt++ < MAX_INLINE_NEST) { > > + if (a2l->filename && !strlen(a2l->filename)) > + a2l->filename = NULL; > + > if (node != NULL) { > if (inline_list__append_dso_a2l(dso, node, sym)) > return 0; > -- > 2.13.3