From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
Ross Zwisler <zwisler@chromium.org>, Leo Yan <leo.yan@linaro.org>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Yang Jihong <yangjihong1@huawei.com>,
Andi Kleen <ak@linux.intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Sean Christopherson <seanjc@google.com>,
K Prateek Nayak <kprateek.nayak@amd.com>,
Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Subject: [PATCH v2 07/16] tools lib api fs tracing_path: Remove two unused MAX_PATH paths
Date: Fri, 26 May 2023 11:33:52 -0700 [thread overview]
Message-ID: <20230526183401.2326121-8-irogers@google.com> (raw)
In-Reply-To: <20230526183401.2326121-1-irogers@google.com>
tracing_mnt was set but never written. tracing_events_path was set and
read on errors paths, but its value is exactly tracing_path with a
"/events" appended, so we can derive the value in the error
paths. There appears to have been a missing "/" when
tracing_events_path was initialized.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/api/fs/tracing_path.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/tools/lib/api/fs/tracing_path.c b/tools/lib/api/fs/tracing_path.c
index 7ba3e81274e8..30745f35d0d2 100644
--- a/tools/lib/api/fs/tracing_path.c
+++ b/tools/lib/api/fs/tracing_path.c
@@ -13,17 +13,12 @@
#include "tracing_path.h"
-static char tracing_mnt[PATH_MAX] = "/sys/kernel/debug";
static char tracing_path[PATH_MAX] = "/sys/kernel/tracing";
-static char tracing_events_path[PATH_MAX] = "/sys/kernel/tracing/events";
static void __tracing_path_set(const char *tracing, const char *mountpoint)
{
- snprintf(tracing_mnt, sizeof(tracing_mnt), "%s", mountpoint);
snprintf(tracing_path, sizeof(tracing_path), "%s/%s",
mountpoint, tracing);
- snprintf(tracing_events_path, sizeof(tracing_events_path), "%s/%s%s",
- mountpoint, tracing, "events");
}
static const char *tracing_path_tracefs_mount(void)
@@ -149,15 +144,15 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size,
/* sdt markers */
if (!strncmp(filename, "sdt_", 4)) {
snprintf(buf, size,
- "Error:\tFile %s/%s not found.\n"
+ "Error:\tFile %s/events/%s not found.\n"
"Hint:\tSDT event cannot be directly recorded on.\n"
"\tPlease first use 'perf probe %s:%s' before recording it.\n",
- tracing_events_path, filename, sys, name);
+ tracing_path, filename, sys, name);
} else {
snprintf(buf, size,
- "Error:\tFile %s/%s not found.\n"
+ "Error:\tFile %s/events/%s not found.\n"
"Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n",
- tracing_events_path, filename);
+ tracing_path, filename);
}
break;
}
@@ -169,9 +164,9 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size,
break;
case EACCES: {
snprintf(buf, size,
- "Error:\tNo permissions to read %s/%s\n"
+ "Error:\tNo permissions to read %s/events/%s\n"
"Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",
- tracing_events_path, filename, tracing_path_mount());
+ tracing_path, filename, tracing_path_mount());
}
break;
default:
--
2.41.0.rc0.172.g3f132b7071-goog
next prev parent reply other threads:[~2023-05-26 18:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 18:33 [PATCH v2 00/16] Address some perf memory/data size issues Ian Rogers
2023-05-26 18:33 ` [PATCH v2 01/16] perf header: Make nodes dynamic in write_mem_topology Ian Rogers
2023-05-26 18:33 ` [PATCH v2 02/16] perf test x86: insn-x86 test data is immutable so mark it const Ian Rogers
2023-05-26 18:33 ` [PATCH v2 03/16] perf test x86: intel-pt-test " Ian Rogers
2023-05-26 18:33 ` [PATCH v2 04/16] perf trace: Make some large static arrays const Ian Rogers
2023-05-26 18:33 ` [PATCH v2 05/16] perf trace beauty: Make MSR " Ian Rogers
2023-05-26 18:33 ` [PATCH v2 06/16] tools api fs: Avoid large static PATH_MAX arrays Ian Rogers
2023-05-26 18:33 ` Ian Rogers [this message]
2023-05-26 18:33 ` [PATCH v2 08/16] perf daemon: Dynamically allocate path to perf Ian Rogers
2023-05-26 18:33 ` [PATCH v2 09/16] perf lock: Dynamically allocate lockhash_table Ian Rogers
2023-05-26 18:33 ` [PATCH v2 10/16] perf timechart: Make large arrays dynamic Ian Rogers
2023-05-26 18:33 ` [PATCH v2 11/16] perf probe: Dynamically allocate params memory Ian Rogers
2023-06-01 4:50 ` Masami Hiramatsu
2023-05-26 18:33 ` [PATCH v2 12/16] perf path: Make mkpath thread safe Ian Rogers
2023-05-26 18:33 ` [PATCH v2 13/16] perf scripting-engines: Move static to local variable Ian Rogers
2023-05-26 18:33 ` [PATCH v2 14/16] tools api fs: Dynamically allocate cgroupfs mount point cache Ian Rogers
2023-05-26 18:34 ` [PATCH v2 15/16] perf test pmu: Avoid 2 static path arrays Ian Rogers
2023-05-26 18:34 ` [PATCH v2 16/16] libsubcmd: Avoid two path statics Ian Rogers
2023-05-30 4:57 ` [PATCH v2 00/16] Address some perf memory/data size issues Andi Kleen
2023-05-30 6:54 ` Ian Rogers
2023-05-30 7:59 ` Andi Kleen
2023-05-30 14:45 ` Ian Rogers
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=20230526183401.2326121-8-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kprateek.nayak@amd.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=rostedt@goodmis.org \
--cc=seanjc@google.com \
--cc=yangjihong1@huawei.com \
--cc=yangtiezhu@loongson.cn \
--cc=zwisler@chromium.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).