[PATCH 16/24] perf daemon: Use control to stop session

[Jiri Olsa]

Using 'stop' control command to stop perf record session.
If that fails, falling back to current SIGTERM/SIGKILL pair.

Signed-off-by: Jiri Olsa <jo...@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