linux-kernel - Re: [PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 11 Jan 2016 10:18:20 +0100
From:	Jiri Olsa <jolsa@...hat.com>
To:	Namhyung Kim <namhyung@...nel.org>
Cc:	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Ingo Molnar <mingo@...nel.org>,
	Peter Zijlstra <peterz@...radead.org>,
	Jiri Olsa <jolsa@...nel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	David Ahern <dsahern@...il.com>,
	Andi Kleen <andi@...stfloor.org>,
	Wang Nan <wangnan0@...wei.com>
Subject: Re: [PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt

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@...nel.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

jirka