Em Thu, May 12, 2016 at 08:43:12AM +0000, He Kuang escreveu: > 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.
Makes perfect sense, David, do you have any concern? Can I have your Acked-by? - Arnaldo > Signed-off-by: He Kuang <heku...@huawei.com> > --- > 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
