lkml.org 
[lkml]   [2016]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt
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 <namhyung@kernel.org>
> > ---
> > 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 <subcmd/parse-options.h>
> > +#include <subcmd/exec-cmd.h>
> > #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

\
 
 \ /
  Last update: 2016-01-12 17:21    [W:0.111 / U:0.476 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site