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 6/8] perf daemon: Add stop command
Date: Sat, 12 Dec 2020 11:43:56 +0100 [thread overview]
Message-ID: <20201212104358.412065-7-jolsa@kernel.org> (raw)
In-Reply-To: <20201212104358.412065-1-jolsa@kernel.org>
Allow 'perf daemon' to stop daemon process:
# perf daemon --stop
perf daemon is exciting
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Documentation/perf-daemon.txt | 8 ++++++++
tools/perf/builtin-daemon.c | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/tools/perf/Documentation/perf-daemon.txt b/tools/perf/Documentation/perf-daemon.txt
index 203ec4bf704c..87de2c77e4c7 100644
--- a/tools/perf/Documentation/perf-daemon.txt
+++ b/tools/perf/Documentation/perf-daemon.txt
@@ -35,6 +35,9 @@ OPTIONS
Send SIGUSR2 to specific session, if session is not specified,
send SIGUSR2 to all sessions.
+--stop::
+ Stop daemon.
+
-v::
--verbose::
Be more verbose.
@@ -116,6 +119,11 @@ And check that the perf data dump was trigered:
[ perf record: Dump /opt/perfdata/2/perf.data.2020120715220385 ]
+Stop daemon:
+
+ # perf daemon --stop
+ perf daemon is exciting
+
SEE ALSO
--------
linkperf:perf-record[1], linkperf:perf-config[1]
diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index c53d4ddc2b49..855fed2fe364 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -451,6 +451,7 @@ enum cmd {
CMD_LIST = 0,
CMD_LIST_VERBOSE = 1,
CMD_SIGNAL = 2,
+ CMD_STOP = 3,
CMD_MAX,
};
@@ -528,6 +529,10 @@ static int handle_server_socket(struct daemon *daemon, int sock_fd)
case CMD_SIGNAL:
ret = cmd_session_kill(daemon, out, fd);
break;
+ case CMD_STOP:
+ done = 1;
+ pr_debug("perf daemon is exciting\n");
+ break;
default:
break;
}
@@ -811,6 +816,7 @@ int cmd_daemon(int argc, const char **argv)
{
bool foreground = false;
bool signal = false;
+ bool stop = false;
const char *config = NULL;
const char *signal_str = NULL;
struct daemon daemon = {
@@ -821,6 +827,7 @@ int cmd_daemon(int argc, const char **argv)
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
OPT_STRING(0, "config", &config,
"config file", "config file path"),
+ OPT_BOOLEAN(0, "stop", &stop, "stop daemon"),
OPT_BOOLEAN('f', "foreground", &foreground, "stay on console"),
OPT_STRING_OPTARG_SET('s', "signal", &signal_str, &signal,
"signal", "send signal to session", "all"),
@@ -837,5 +844,8 @@ int cmd_daemon(int argc, const char **argv)
if (signal)
return send_cmd(&daemon, CMD_SIGNAL, signal_str);
+ if (stop)
+ return send_cmd(&daemon, CMD_STOP, NULL);
+
return send_cmd(&daemon, verbose ? CMD_LIST_VERBOSE : CMD_LIST, NULL);
}
--
2.26.2
next prev parent reply other threads:[~2020-12-12 10:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 10:43 [RFC 0/8] perf tools: Add daemon command Jiri Olsa
2020-12-12 10:43 ` [PATCH 1/8] perf tools: Add debug_set_file function Jiri Olsa
2020-12-15 15:37 ` Arnaldo Carvalho de Melo
2020-12-12 10:43 ` [PATCH 2/8] perf tools: Add debug_set_display_time function Jiri Olsa
2020-12-15 15:37 ` Arnaldo Carvalho de Melo
2020-12-12 10:43 ` [PATCH 3/8] perf tools: Add config set interface Jiri Olsa
2020-12-15 15:41 ` Arnaldo Carvalho de Melo
2020-12-15 19:11 ` Jiri Olsa
2020-12-12 10:43 ` [PATCH 4/8] perf daemon: Add daemon command Jiri Olsa
2020-12-15 15:40 ` Alexei Budankov
2020-12-15 19:43 ` Jiri Olsa
2020-12-16 7:54 ` Alexei Budankov
2020-12-16 8:14 ` Jiri Olsa
2020-12-18 13:25 ` Namhyung Kim
2020-12-18 19:30 ` Jiri Olsa
2020-12-15 15:44 ` Arnaldo Carvalho de Melo
2020-12-15 19:20 ` Jiri Olsa
2020-12-12 10:43 ` [PATCH 5/8] perf daemon: Add signal command Jiri Olsa
2020-12-15 15:45 ` Arnaldo Carvalho de Melo
2020-12-15 19:14 ` Jiri Olsa
2020-12-12 10:43 ` Jiri Olsa [this message]
2020-12-15 15:45 ` [PATCH 6/8] perf daemon: Add stop command Arnaldo Carvalho de Melo
2020-12-12 10:43 ` [PATCH 7/8] perf daemon: Allow only one daemon over base directory Jiri Olsa
2020-12-15 15:46 ` Arnaldo Carvalho de Melo
2020-12-15 19:16 ` Jiri Olsa
2020-12-12 10:43 ` [PATCH 8/8] perf daemon: Set control fifo for session Jiri Olsa
2020-12-15 15:47 ` Arnaldo Carvalho de Melo
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=20201212104358.412065-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.