From: Changbin Du <changbin.du@huawei.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
<linux-perf-users@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Hui Wang <hw.huiwang@huawei.com>,
Changbin Du <changbin.du@huawei.com>
Subject: [PATCH v2 3/3] perf: ftrace: reuse target::initial_delay
Date: Thu, 2 Mar 2023 11:11:46 +0800 [thread overview]
Message-ID: <20230302031146.2801588-4-changbin.du@huawei.com> (raw)
In-Reply-To: <20230302031146.2801588-1-changbin.du@huawei.com>
Replace perf_ftrace::initial_delay with target::initial_delay. Specifying
a negative initial_delay is meaningless for ftrace in practice but allowed
here.
Signed-off-by: Changbin Du <changbin.du@huawei.com>
---
tools/perf/builtin-ftrace.c | 10 +++++-----
tools/perf/util/ftrace.h | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index d7fe00f66b83..73d51ce84c3a 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -623,7 +623,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace)
/* display column headers */
read_tracing_file_to_stdout("trace");
- if (!ftrace->initial_delay) {
+ if (!ftrace->target.initial_delay) {
if (write_tracing_file("tracing_on", "1") < 0) {
pr_err("can't enable tracing\n");
goto out_close_fd;
@@ -632,8 +632,8 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace)
evlist__start_workload(ftrace->evlist);
- if (ftrace->initial_delay) {
- usleep(ftrace->initial_delay * 1000);
+ if (ftrace->target.initial_delay > 0) {
+ usleep(ftrace->target.initial_delay * 1000);
if (write_tracing_file("tracing_on", "1") < 0) {
pr_err("can't enable tracing\n");
goto out_close_fd;
@@ -1164,8 +1164,8 @@ int cmd_ftrace(int argc, const char **argv)
"Size of per cpu buffer, needs to use a B, K, M or G suffix.", parse_buffer_size),
OPT_BOOLEAN(0, "inherit", &ftrace.inherit,
"Trace children processes"),
- OPT_UINTEGER('D', "delay", &ftrace.initial_delay,
- "Number of milliseconds to wait before starting tracing after program start"),
+ OPT_INTEGER('D', "delay", &ftrace.target.initial_delay,
+ "Number of milliseconds to wait before starting tracing after program start"),
OPT_PARENT(common_options),
};
const struct option latency_options[] = {
diff --git a/tools/perf/util/ftrace.h b/tools/perf/util/ftrace.h
index a34cd15733b8..558efcb98d25 100644
--- a/tools/perf/util/ftrace.h
+++ b/tools/perf/util/ftrace.h
@@ -25,7 +25,6 @@ struct perf_ftrace {
int graph_noirqs;
int graph_verbose;
int graph_thresh;
- unsigned int initial_delay;
};
struct filter_entry {
--
2.25.1
next prev parent reply other threads:[~2023-03-02 3:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 3:11 [PATCH v2 0/3] perf : fix counting when initial delay configured Changbin Du
2023-03-02 3:11 ` [PATCH v2 1/3] perf stat: " Changbin Du
2023-03-02 3:11 ` [PATCH v2 2/3] perf record: reuse target::initial_delay Changbin Du
2023-03-02 3:11 ` Changbin Du [this message]
2023-03-02 19:22 ` [PATCH v2 0/3] perf : fix counting when initial delay configured Namhyung Kim
2023-03-02 20:40 ` Arnaldo Carvalho de Melo
2023-03-10 2:37 ` Changbin Du
2023-03-10 15:05 ` Arnaldo Carvalho de Melo
2023-03-13 1:58 ` Changbin Du
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=20230302031146.2801588-4-changbin.du@huawei.com \
--to=changbin.du@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=hw.huiwang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).