Skip to content

Commit

Permalink
perf tools: Add perf_exe() helper to find perf binary
Browse files Browse the repository at this point in the history
Also convert one existing user.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20190224153722.27020-9-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Andi Kleen authored and Arnaldo Carvalho de Melo committed Feb 25, 2019
1 parent 4b6ac81 commit 94816ad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
12 changes: 3 additions & 9 deletions tools/perf/util/header.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,17 +527,11 @@ static int write_event_desc(struct feat_fd *ff,
static int write_cmdline(struct feat_fd *ff,
struct perf_evlist *evlist __maybe_unused)
{
char buf[MAXPATHLEN];
u32 n;
int i, ret;
char pbuf[MAXPATHLEN], *buf;
int i, ret, n;

/* actual path to perf binary */
ret = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
if (ret <= 0)
return -1;

/* readlink() does not add null termination */
buf[ret] = '\0';
buf = perf_exe(pbuf, MAXPATHLEN);

/* account for binary path */
n = perf_env.nr_cmdline + 1;
Expand Down
10 changes: 10 additions & 0 deletions tools/perf/util/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,3 +568,13 @@ const char *perf_tip(const char *dirpath)

return tip;
}

char *perf_exe(char *buf, int len)
{
int n = readlink("/proc/self/exe", buf, len);
if (n > 0) {
buf[n] = 0;
return buf;
}
return strcpy(buf, "perf");
}
2 changes: 2 additions & 0 deletions tools/perf/util/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ extern bool perf_singlethreaded;
void perf_set_singlethreaded(void);
void perf_set_multithreaded(void);

char *perf_exe(char *buf, int len);

#ifndef O_CLOEXEC
#ifdef __sparc__
#define O_CLOEXEC 0x400000
Expand Down

0 comments on commit 94816ad

Please sign in to comment.