From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723AbcELIoV (ORCPT ); Thu, 12 May 2016 04:44:21 -0400 Received: from szxga05-in.huawei.com ([58.251.152.179]:34079 "EHLO szxga05-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752397AbcELIoQ (ORCPT ); Thu, 12 May 2016 04:44:16 -0400 From: He Kuang To: , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v3 3/7] perf tools: Remove the logical that skip buildid cache if symfs is given Date: Thu, 12 May 2016 08:43:12 +0000 Message-ID: <1463042596-61703-4-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1463042596-61703-1-git-send-email-hekuang@huawei.com> References: <1463042596-61703-1-git-send-email-hekuang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.57344256.00C7,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b9b5ecad818a8f387196dacbc4269649 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Symfs dir and buildid dir are two places that perf looks into for symbols, currently, if symfs dir is given, buildid-cache is skipped. In the cross-platform perf record/script scenario, we need vdsos in buildid-cache dir and other libs in symfs dir at the same time. And consider that the binaries indexed by buildid do not cause ambiguity, this patch simply removes that logical. Signed-off-by: He Kuang --- tools/perf/util/dso.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index b39b80c..a07166c5 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -64,8 +64,7 @@ int dso__read_binary_type_filename(const struct dso *dso, break; case DSO_BINARY_TYPE__BUILD_ID_CACHE: /* skip the locally configured cache if a symfs is given */ - if (symbol_conf.symfs[0] || - (dso__build_id_filename(dso, filename, size) == NULL)) + if (dso__build_id_filename(dso, filename, size) == NULL) ret = -1; break; -- 1.8.5.2