From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>,
Alexei Budankov <abudankov@huawei.com>
Subject: [PATCH 16/24] perf daemon: Use control to stop session
Date: Sun, 31 Jan 2021 00:48:48 +0100 [thread overview]
Message-ID: <20210130234856.271282-17-jolsa@kernel.org> (raw)
In-Reply-To: <20210130234856.271282-1-jolsa@kernel.org>
Using 'stop' control command to stop perf record session.
If that fails, falling back to current SIGTERM/SIGKILL pair.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-daemon.c | 56 ++++++++++++++++++++++++++++++-------
1 file changed, 46 insertions(+), 10 deletions(-)
diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index a5a71e0a706c..92dba933027d 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -821,11 +821,25 @@ static int setup_client_socket(struct daemon *daemon)
static void session__kill(struct session *session, struct daemon *daemon)
{
- session__signal(session, SIGTERM);
- if (session__wait(session, daemon, 10)) {
- session__signal(session, SIGKILL);
- session__wait(session, daemon, 10);
- }
+ int how = 0;
+
+ do {
+ switch (how) {
+ case 0:
+ session__control(session, "stop", false);
+ break;
+ case 1:
+ session__signal(session, SIGTERM);
+ break;
+ case 2:
+ session__signal(session, SIGKILL);
+ break;
+ default:
+ break;
+ }
+ how++;
+
+ } while (session__wait(session, daemon, 10));
}
static void daemon__signal(struct daemon *daemon, int sig)
@@ -850,13 +864,35 @@ static void session__remove(struct session *session)
session__free(session);
}
+static void daemon__stop(struct daemon *daemon)
+{
+ struct session *session;
+
+ list_for_each_entry(session, &daemon->sessions, list)
+ session__control(session, "stop", false);
+}
+
static void daemon__kill(struct daemon *daemon)
{
- daemon__signal(daemon, SIGTERM);
- if (daemon__wait(daemon, 10)) {
- daemon__signal(daemon, SIGKILL);
- daemon__wait(daemon, 10);
- }
+ int how = 0;
+
+ do {
+ switch (how) {
+ case 0:
+ daemon__stop(daemon);
+ break;
+ case 1:
+ daemon__signal(daemon, SIGTERM);
+ break;
+ case 2:
+ daemon__signal(daemon, SIGKILL);
+ break;
+ default:
+ break;
+ }
+ how++;
+
+ } while (daemon__wait(daemon, 10));
}
static void __daemon__free(struct daemon *daemon)
--
2.29.2
next prev parent reply other threads:[~2021-01-30 23:53 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-01-30 23:48 ` [PATCHv3 00/24] perf tools: Add daemon command Jiri Olsa
2021-01-30 23:48 ` [PATCH 01/24] perf daemon: " Jiri Olsa
2021-01-30 23:48 ` [PATCH 02/24] perf daemon: Add config option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-02-04 14:42 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 03/24] perf daemon: Add base option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-01-30 23:48 ` [PATCH 04/24] perf daemon: Add server socket support Jiri Olsa
2021-02-03 21:04 ` Arnaldo Carvalho de Melo
2021-02-04 14:49 ` Jiri Olsa
2021-02-04 15:53 ` Arnaldo Carvalho de Melo
2021-02-05 11:30 ` Namhyung Kim
2021-02-06 19:04 ` Jiri Olsa
2021-02-07 1:36 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 05/24] perf daemon: Add client " Jiri Olsa
2021-02-03 21:05 ` Arnaldo Carvalho de Melo
2021-02-04 14:50 ` Jiri Olsa
2021-02-05 11:39 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-03 21:12 ` Arnaldo Carvalho de Melo
2021-02-04 15:08 ` Jiri Olsa
2021-02-06 20:25 ` Jiri Olsa
2021-02-04 12:42 ` Namhyung Kim
2021-02-04 12:58 ` Arnaldo Carvalho de Melo
2021-02-04 15:10 ` Jiri Olsa
2021-02-06 8:06 ` Namhyung Kim
2021-02-05 12:14 ` Namhyung Kim
2021-02-05 12:56 ` Jiri Olsa
2021-02-06 8:05 ` Namhyung Kim
2021-02-06 22:35 ` Jiri Olsa
2021-02-07 1:38 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 07/24] perf daemon: Add config file change check Jiri Olsa
2021-02-03 21:13 ` Arnaldo Carvalho de Melo
2021-02-04 14:51 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 08/24] perf daemon: Add background support Jiri Olsa
2021-02-03 21:16 ` Arnaldo Carvalho de Melo
2021-02-04 14:52 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 09/24] perf daemon: Add signalfd support Jiri Olsa
2021-02-03 21:24 ` Arnaldo Carvalho de Melo
2021-02-04 15:06 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 10/24] perf daemon: Add list command Jiri Olsa
2021-01-30 23:48 ` [PATCH 11/24] perf daemon: Add signal command Jiri Olsa
2021-01-30 23:48 ` [PATCH 12/24] perf daemon: Add stop command Jiri Olsa
2021-01-30 23:48 ` [PATCH 13/24] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-01-30 23:48 ` [PATCH 14/24] perf daemon: Set control fifo for session Jiri Olsa
2021-01-30 23:48 ` [PATCH 15/24] perf daemon: Add ping command Jiri Olsa
2021-01-30 23:48 ` Jiri Olsa [this message]
2021-01-30 23:48 ` [PATCH 17/24] perf daemon: Add up time for daemon/session list Jiri Olsa
2021-01-30 23:48 ` [PATCH 18/24] perf daemon: Add man page for perf-daemon Jiri Olsa
2021-02-03 21:17 ` Arnaldo Carvalho de Melo
2021-02-04 14:53 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 19/24] perf tests: Add daemon list command test Jiri Olsa
2021-01-30 23:48 ` [PATCH 20/24] perf tests: Add daemon reconfig test Jiri Olsa
2021-01-30 23:48 ` [PATCH 21/24] perf tests: Add daemon stop command test Jiri Olsa
2021-01-30 23:48 ` [PATCH 22/24] perf tests: Add daemon signal " Jiri Olsa
2021-01-30 23:48 ` [PATCH 23/24] perf tests: Add daemon ping " Jiri Olsa
2021-01-30 23:48 ` [PATCH 24/24] perf tests: Add daemon lock test Jiri Olsa
2021-02-08 20:08 [PATCHv4 00/24] perf tools: Add daemon command Jiri Olsa
2021-02-08 20:09 ` [PATCH 16/24] perf daemon: Use control to stop session 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=20210130234856.271282-17-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@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
Powered by JetHome