From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-perf-users@vger.kernel.org,
linux-kernel@vger.kernel.org, eranian@google.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v2 07/11] perf tools: Add perf_exe() helper to find perf binary
Date: Mon, 25 Feb 2019 19:04:08 -0800 [thread overview]
Message-ID: <20190226030412.23485-8-andi@firstfloor.org> (raw)
In-Reply-To: <20190226030412.23485-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Also convert one existing user.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
| 12 +++---------
tools/perf/util/util.c | 10 ++++++++++
tools/perf/util/util.h | 2 ++
3 files changed, 15 insertions(+), 9 deletions(-)
--git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 61ce197c5362..2f290a0343d4 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -526,17 +526,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;
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 320b0fef249a..dd693e018aef 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -507,3 +507,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");
+}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index ece040b799f6..dc2a99ad5c96 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -76,6 +76,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
--
2.17.2
next prev parent reply other threads:[~2019-02-26 3:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 3:04 Support sample context in perf report Andi Kleen
2019-02-26 3:04 ` [PATCH v2 01/11] perf tools script: Support insn output for normal samples Andi Kleen
2019-02-26 3:04 ` [PATCH v2 02/11] perf tools report: Support nano seconds Andi Kleen
2019-02-26 3:04 ` [PATCH v2 03/11] perf tools report: Parse time quantum Andi Kleen
2019-02-26 3:04 ` [PATCH v2 04/11] perf tools report: Support time sort key Andi Kleen
2019-02-26 3:04 ` [PATCH v2 05/11] perf tools report: Use less for scripts output Andi Kleen
2019-02-26 3:04 ` [PATCH v2 06/11] perf tools report: Support running scripts for current time range Andi Kleen
2019-02-26 3:04 ` Andi Kleen [this message]
2019-02-26 3:04 ` [PATCH v2 08/11] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-02-26 3:04 ` [PATCH v2 09/11] perf tools: Add utility function to print ns time stamps Andi Kleen
2019-02-26 3:04 ` [PATCH v2 10/11] perf tools report: Implement browsing of individual samples Andi Kleen
2019-02-26 3:04 ` [PATCH v2 11/11] perf tools: Add some new tips describing the new options Andi Kleen
2019-02-26 22:33 ` Support sample context in perf report Jiri Olsa
2019-02-26 22:55 ` Andi Kleen
2019-02-27 11:18 ` Jiri Olsa
2019-02-27 16:01 ` Andi Kleen
2019-02-27 16:16 ` Jiri Olsa
2019-02-27 17:29 ` Andi Kleen
2019-02-27 17:41 ` Arnaldo Carvalho de Melo
2019-02-27 17:56 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190226030412.23485-8-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).