From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Andi Kleen <ak@linux.intel.com>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 05/11] perf stat: implement control commands handling
Date: Wed, 6 May 2020 21:21:38 +0300 [thread overview]
Message-ID: <24164c07-c16c-b970-6d97-63ce383fc238@linux.intel.com> (raw)
In-Reply-To: <d582cc3d-2302-c7e2-70d3-bc7ab6f628c3@linux.intel.com>
Implement handling of 'enable' and 'disable' control commands
coming from control file descriptor.
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
tools/perf/builtin-stat.c | 48 +++++++++++++++++++++++++++++----------
1 file changed, 36 insertions(+), 12 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index bda777ca0420..5aab3ff1bbea 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -460,8 +460,9 @@ static int handle_events(pid_t pid, struct perf_stat_config *config)
{
pid_t child = 0;
bool res, stop = false;
- struct timespec time_to_sleep;
- int sleep_time, status = 0, times = config->times;
+ int time_to_sleep, sleep_time, status = 0, times = config->times;
+ enum evlist_ctl_cmd cmd = CTL_CMD_UNSUPPORTED;
+ struct timespec time_start, time_stop, time_diff;
if (config->interval)
sleep_time = config->interval;
@@ -470,22 +471,45 @@ static int handle_events(pid_t pid, struct perf_stat_config *config)
else
sleep_time = 1000;
- time_to_sleep.tv_sec = sleep_time / MSEC_PER_SEC;
- time_to_sleep.tv_nsec = (sleep_time % MSEC_PER_SEC) * NSEC_PER_MSEC;
+ time_to_sleep = sleep_time;
do {
if (pid != -1)
child = waitpid(pid, &status, WNOHANG);
if (child || stop || done)
break;
- nanosleep(&time_to_sleep, NULL);
- if (pid == -1)
- stop = !is_target_alive(&target, evsel_list->core.threads);
- if (config->timeout) {
- stop = !stop ? true : stop;
- } else {
- res = print_interval_and_stop(config, ×);
- stop = !stop ? res : stop;
+ clock_gettime(CLOCK_MONOTONIC, &time_start);
+ if (!(evlist__poll(evsel_list, time_to_sleep) > 0)) { /* poll timeout or EINTR */
+ if (pid == -1)
+ stop = !is_target_alive(&target, evsel_list->core.threads);
+ if (config->timeout) {
+ stop = !stop ? true : stop;
+ } else {
+ res = print_interval_and_stop(config, ×);
+ stop = !stop ? res : stop;
+ }
+ time_to_sleep = sleep_time;
+ } else { /* fd revent */
+ if (perf_evlist__ctlfd_process(evsel_list, &cmd) > 0) {
+ switch (cmd) {
+ case CTL_CMD_ENABLE:
+ pr_info(PERF_EVLIST__ENABLED_MSG);
+ stop = print_interval_and_stop(config, ×);
+ break;
+ case CTL_CMD_DISABLE:
+ stop = print_interval_and_stop(config, ×);
+ pr_info(PERF_EVLIST__DISABLED_MSG);
+ break;
+ case CTL_CMD_ACK:
+ case CTL_CMD_UNSUPPORTED:
+ default:
+ break;
+ }
+ }
+ clock_gettime(CLOCK_MONOTONIC, &time_stop);
+ diff_timespec(&time_diff, &time_stop, &time_start);
+ time_to_sleep -= time_diff.tv_sec * MSEC_PER_SEC +
+ time_diff.tv_nsec / NSEC_PER_MSEC;
}
} while (1);
--
2.24.1
next prev parent reply other threads:[~2020-05-06 18:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 17:16 [PATCH v2 00/11] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-05-06 18:18 ` [PATCH v2 01/11] perf evlist: introduce control file descriptors Alexey Budankov
2020-05-06 18:19 ` [PATCH v2 02/11] perf evlist: implement control command handling functions Alexey Budankov
2020-05-06 20:21 ` Arnaldo Carvalho de Melo
2020-05-07 8:32 ` Alexey Budankov
2020-05-07 17:01 ` Arnaldo Carvalho de Melo
2020-05-07 17:51 ` Alexey Budankov
2020-05-06 18:20 ` [PATCH v2 03/11] perf stat: factor out event handling loop into a function Alexey Budankov
2020-05-06 18:20 ` [PATCH v2 04/11] perf stat: extend -D,--delay option with -1 value Alexey Budankov
2020-05-06 20:12 ` Arnaldo Carvalho de Melo
2020-05-07 8:34 ` Alexey Budankov
2020-05-06 18:21 ` Alexey Budankov [this message]
2020-05-06 18:22 ` [PATCH v2 06/11] perf stat: introduce --ctl-fd[-ack] options Alexey Budankov
2020-05-06 18:22 ` [PATCH v2 07/11] perf docs: extend stat mode docs with info on " Alexey Budankov
2020-05-06 20:22 ` Arnaldo Carvalho de Melo
2020-05-07 8:35 ` Alexey Budankov
2020-05-06 18:28 ` [PATCH v2 08/11] perf record: extend -D,--delay option with -1 value Alexey Budankov
2020-05-06 18:29 ` [PATCH v2 09/11] perf record: implement control commands handling Alexey Budankov
2020-05-06 20:23 ` Arnaldo Carvalho de Melo
2020-05-07 8:58 ` Alexey Budankov
2020-05-07 17:02 ` Arnaldo Carvalho de Melo
2020-05-06 18:29 ` [PATCH v2 10/11] perf record: introduce --ctl-fd[-ack] options Alexey Budankov
2020-05-06 18:30 ` [PATCH v2 11/11] perf docs: extend record mode docs with info on " Alexey Budankov
2020-05-06 20:27 ` Arnaldo Carvalho de Melo
2020-05-07 8:36 ` Alexey Budankov
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=24164c07-c16c-b970-6d97-63ce383fc238@linux.intel.com \
--to=alexey.budankov@linux.intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--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