From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762789AbcALPfT (ORCPT ); Tue, 12 Jan 2016 10:35:19 -0500 Received: from mail.kernel.org ([198.145.29.136]:60139 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759842AbcALPej (ORCPT ); Tue, 12 Jan 2016 10:34:39 -0500 Date: Tue, 12 Jan 2016 12:34:35 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: Namhyung Kim , Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Andi Kleen , Wang Nan Subject: Re: [PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt Message-ID: <20160112153435.GF18367@kernel.org> References: <1452334589-8782-1-git-send-email-namhyung@kernel.org> <1452334589-8782-4-git-send-email-namhyung@kernel.org> <20160111091820.GB15415@krava.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160111091820.GB15415@krava.brq.redhat.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Jan 11, 2016 at 10:18:20AM +0100, Jiri Olsa escreveu: > On Sat, Jan 09, 2016 at 07:16:29PM +0900, Namhyung Kim wrote: > > Some people don't install perf, but just use compiled version in the > > source. Fallback to lookup the source directory for those poor guys. :) > > > > Signed-off-by: Namhyung Kim > > --- > > tools/perf/builtin-report.c | 10 +++++++++- > > tools/perf/util/util.c | 11 ++++++----- > > 2 files changed, 15 insertions(+), 6 deletions(-) > > > > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c > > index d5a42ee12529..2bf537f190a0 100644 > > --- a/tools/perf/builtin-report.c > > +++ b/tools/perf/builtin-report.c > > @@ -28,6 +28,7 @@ > > #include "util/tool.h" > > > > #include > > +#include > > #include "util/parse-events.h" > > > > #include "util/thread.h" > > @@ -433,7 +434,14 @@ static int report__browse_hists(struct report *rep) > > int ret; > > struct perf_session *session = rep->session; > > struct perf_evlist *evlist = session->evlist; > > - const char *help = perf_tip(TIPDIR); > > + const char *help = perf_tip(system_path(TIPDIR)); > > + > > + if (help == NULL) { > > + /* fallback for people who don't install perf ;-) */ > > + help = perf_tip(DOCDIR); > > + if (help == NULL) > > + help = "Cannot load tips.txt file, please install perf!"; > > + } > > hum, I can't get this one.. seems like perf_tip does > not retun NULL if there's no tip.txt file Neither me, fixing it up, this fallback will never take place. - Arnaldo