From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, 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 v6 07/13] perf stat: factor out event handling loop into dispatch_events()
Date: Mon, 1 Jun 2020 23:10:58 +0300 [thread overview]
Message-ID: <c27103c6-fb6b-4b86-af84-0f0e8a334850@linux.intel.com> (raw)
In-Reply-To: <f8e3a714-d9b1-4647-e1d2-9981cbaa83ec@linux.intel.com>
Consolidate event dispatching loops for fork, attach and system
wide monitoring use cases into common dispatch_events() function.
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
tools/perf/builtin-stat.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index edd6fdcd1c72..f2d1b8c1481d 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -504,6 +504,27 @@ static bool is_target_alive(struct target *_target,
return false;
}
+static int dispatch_events(bool forks, int timeout, int interval, int *times, struct timespec *ts)
+{
+ bool stop = false;
+ int child = 0, status = 0;
+
+ while (1) {
+ if (forks)
+ child = waitpid(child_pid, &status, WNOHANG);
+ else
+ child = !is_target_alive(&target, evsel_list->core.threads) ? 1 : 0;
+
+ if (done || stop || child)
+ break;
+
+ nanosleep(ts, NULL);
+ stop = process_timeout(timeout, interval, times);
+ }
+
+ return status;
+}
+
enum counter_recovery {
COUNTER_SKIP,
COUNTER_RETRY,
@@ -575,7 +596,6 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
struct affinity affinity;
int i, cpu;
bool second_pass = false;
- bool stop = false;
if (interval) {
ts.tv_sec = interval / USEC_PER_MSEC;
@@ -744,12 +764,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
perf_evlist__start_workload(evsel_list);
enable_counters();
- if (interval || timeout) {
- while (!stop && !waitpid(child_pid, &status, WNOHANG)) {
- nanosleep(&ts, NULL);
- stop = process_timeout(timeout, interval, ×);
- }
- }
+ if (interval || timeout)
+ status = dispatch_events(forks, timeout, interval, ×, &ts);
if (child_pid != -1) {
if (timeout)
kill(child_pid, SIGTERM);
@@ -766,10 +782,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
psignal(WTERMSIG(status), argv[0]);
} else {
enable_counters();
- while (!done && !stop && is_target_alive(&target, evsel_list->core.threads)) {
- nanosleep(&ts, NULL);
- stop = process_timeout(timeout, interval, ×);
- }
+ dispatch_events(forks, timeout, interval, ×, &ts);
}
disable_counters();
--
2.24.1
next prev parent reply other threads:[~2020-06-01 20:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 20:01 [PATCH v6 00/13] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-06-01 20:05 ` [PATCH v6 01/13] tools/libperf: introduce notion of static polled file descriptors Alexey Budankov
2020-06-03 11:38 ` Adrian Hunter
2020-06-03 12:01 ` Alexey Budankov
2020-06-03 12:23 ` Adrian Hunter
2020-06-03 12:30 ` Hunter, Adrian
2020-06-03 12:52 ` Alexey Budankov
2020-06-03 15:53 ` Adrian Hunter
2020-06-03 17:00 ` Alexey Budankov
2020-06-01 20:06 ` [PATCH v6 02/13] perf evlist: introduce control " Alexey Budankov
2020-06-01 20:07 ` [PATCH v6 03/13] perf evlist: implement control command handling functions Alexey Budankov
2020-06-01 20:08 ` [PATCH v6 04/13] perf stat: factor out body of event handling loop for system wide Alexey Budankov
2020-06-01 20:08 ` [PATCH v6 05/13] perf stat: move target check to loop control statement Alexey Budankov
2020-06-01 20:09 ` [PATCH v6 06/13] perf stat: factor out body of event handling loop for fork case Alexey Budankov
2020-06-01 20:10 ` Alexey Budankov [this message]
2020-06-01 20:15 ` [PATCH v6 08/13] perf stat: extend -D,--delay option with -1 value Alexey Budankov
2020-06-01 20:17 ` [PATCH v6 09/13] perf stat: implement control commands handling Alexey Budankov
2020-06-01 20:17 ` [PATCH v6 10/13] perf stat: introduce --ctl-fd[-ack] options Alexey Budankov
2020-06-01 20:18 ` [PATCH v6 11/13] perf record: extend -D,--delay option with -1 value Alexey Budankov
2020-06-01 20:19 ` [PATCH v6 12/13] perf record: implement control commands handling Alexey Budankov
2020-06-01 20:20 ` [PATCH v6 13/13] perf record: introduce --ctl-fd[-ack] options Alexey Budankov
2020-06-03 12:24 ` Adrian Hunter
2020-06-03 12:52 ` 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=c27103c6-fb6b-4b86-af84-0f0e8a334850@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;
as well as URLs for NNTP newsgroup(s).