Received: by 10.223.185.111 with SMTP id b44csp672363wrg; Fri, 9 Mar 2018 11:27:40 -0800 (PST) X-Google-Smtp-Source: AG47ELuUmEOAFP5/H3+7fqTCt9GipiaGcYY2UlqmMQatpEjs4uJunF83bDn+q1DcDv2NbnU/w63s X-Received: by 10.99.140.85 with SMTP id q21mr24685562pgn.51.1520623659917; Fri, 09 Mar 2018 11:27:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520623659; cv=none; d=google.com; s=arc-20160816; b=WsTLWJ0XyE8rSdmkS7smFPf8p+9XmIUJhURjwlD2pFa4It0y/JtGsWjj7Xz5/rhQTF zWoKSIYFqedSLEHAOObx7sSGdAJ8/SZULD1hdsHZLyf/o4YpKuFPIlZ5bqod/TcKmPXC D4jdIh8WYn2UMxYrKgQGH6dt87/TLfL3bFeCz0buh4W2wK6eJSskVw5LysAPhZZeKqMo FxwwnZ3lrU54KCUBEw6hZr8wVMumpgYIkdnwghs+3lZREgH/i01OMvzIQiHk2vI+HGqO nt/PWsooKc/XwYwlaEoK8ofq0iCkWEeY6VXL5L7IuTOC/aof60p2wRPEF/RE5NSSF2Je G/QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=gneqWJe//wZfs697MWTSssUN3N7heyut/ainTLS4IHY=; b=TMQAH/kzhB/up9k3K0jo/r7zq/0lshLXypQkFWEYiyVwDX2n6qUoufLfZvksM6b/7f 45gZG6WOEt/xCglQ6AA7e5qi0zqXCBpg+e/S9fXqLh69OYJ3ONowNSoYiMpnW0bke1DG pybX2VxLxzuJroQMjXzhBSGKbPfhlIeWigaxTzusrW+jn+FnZ33H4tTkn3iaKfMJMe99 qWScEjo2xEWstQ66iH/7QOLbNE2wQp0EiyHMKdZotlaTkb/g4KSvi4dCXj91fYOPNa4T BsBMPulw0K1OEBlNleZ/pCtUliuoIlSRwlj/ulx+jCZxCYaWU5qhIucvpYbIZTR3o4+y bN8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mx.aim.com header.s=20150623 header.b=wO3gfeVe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=aim.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z3-v6si1328234plb.137.2018.03.09.11.27.25; Fri, 09 Mar 2018 11:27:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@mx.aim.com header.s=20150623 header.b=wO3gfeVe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=aim.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932435AbeCIT0d (ORCPT + 99 others); Fri, 9 Mar 2018 14:26:33 -0500 Received: from omr-a012e.mx.aol.com ([204.29.186.61]:44592 "EHLO omr-a012e.mx.aol.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbeCIT0b (ORCPT ); Fri, 9 Mar 2018 14:26:31 -0500 Received: from mtaout-mac01.mx.aol.com (mtaout-mac01.mx.aol.com [172.26.222.205]) by omr-a012e.mx.aol.com (Outbound Mail Relay) with ESMTP id 22C343800084; Fri, 9 Mar 2018 14:26:31 -0500 (EST) Received: from [10.11.12.90] (CPE000db93f888c-CM001404556d28.cpe.net.cable.rogers.com [99.246.128.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mtaout-mac01.mx.aol.com (MUA/Third Party Client Interface) with ESMTPSA id 3FC5238000093; Fri, 9 Mar 2018 14:26:30 -0500 (EST) Subject: Re: [PATCH] perf annotate: Don't prepend symfs path to build_id_filename To: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org References: <20180211191937.9703-1-jpmv27@aim.com> <20180309190715.GB25111@kernel.org> From: Martin Vuille Message-ID: <9dfd677b-14b9-caec-d12e-b0043f541ec4@aim.com> Date: Fri, 9 Mar 2018 14:26:27 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <20180309190715.GB25111@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US x-aol-global-disposition: G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aim.com; s=20150623; t=1520623591; bh=gneqWJe//wZfs697MWTSssUN3N7heyut/ainTLS4IHY=; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; b=wO3gfeVekA/8Tesc/hT2URZ/xniPxQbBJkDBrjJwhoc3P+Qd61bg78pMtTWvx2y+w INcNLIhGMEo9+wNiJJnrY2uL8JKyA0DjRPC2onMQCTao6Jju2t1bchXh5YatmVgokX 15zxKgji3pa8ZSYVXGkZERkKo2Rl/+Dd+OFNMcNY= x-aol-sid: 3039ac1adecd5aa2dfe63d5a X-AOL-IP: 99.246.128.134 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dso__build_id_filename calls build_id_cache__linkname build_id_cache__linkname uses buildid_dir symbol__config_symfs includes the symfs directory in buildid_dir So it's not necessary to prepend it again. Should've included those notes in the original submission. Will do better next time. MV On 03/09/18 14:07, Arnaldo Carvalho de Melo wrote: > Em Sun, Feb 11, 2018 at 02:19:37PM -0500, Martin Vuille escreveu: >> build_id_filename already contains symfs path if applicable, so >> don't prepend it a second time. > Where is the analysis that shows that that is the case? I looked here at > the implementation for dso__build_id_filename() and couldn't find where > was it that the symfs would be appended, can you clarify? > > - Arnaldo > >> Signed-off-by: Martin Vuille >> --- >> tools/perf/util/annotate.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c >> index 28b233c3dcbe..425b7f0760ec 100644 >> --- a/tools/perf/util/annotate.c >> +++ b/tools/perf/util/annotate.c >> @@ -1381,7 +1381,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil >> >> build_id_filename = dso__build_id_filename(dso, NULL, 0, false); >> if (build_id_filename) { >> - __symbol__join_symfs(filename, filename_size, build_id_filename); >> + scnprintf(filename, filename_size, "%s", build_id_filename); >> free(build_id_filename); >> } else { >> if (dso->has_build_id) >> -- >> 2.13.6