From patchwork Tue Oct 17 23:20:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13426200 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5706B43102 for ; Tue, 17 Oct 2023 23:33:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0427EC433C7; Tue, 17 Oct 2023 23:33:27 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qstaa-009G0O-32; Tue, 17 Oct 2023 19:35:04 -0400 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Avidan Borisov , Ross Zwisler , "Steven Rostedt (Google)" Subject: [PATCH 1/2] trace-cmd record: Use SIGTERM as well for --daemonize Date: Tue, 17 Oct 2023 19:20:28 -0400 Message-ID: <20231017233503.2205514-2-rostedt@goodmis.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231017233503.2205514-1-rostedt@goodmis.org> References: <20231017233503.2205514-1-rostedt@goodmis.org> Precedence: bulk X-Mailing-List: linux-trace-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Steven Rostedt (Google)" Currently --daemonize expects a SIGINT to stop the daemon and build the trace.dat file. But if the user just does a: kill it will send a SIGTERM. This will actually kill the process and it will not create the trace.dat file, leaving a bunch of trace.dat.cpuX files just lying around. Update it to also do the same with SIGTERM. Signed-off-by: Steven Rostedt (Google) --- tracecmd/trace-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 69a10bf1f0bd..c943f486291e 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3344,6 +3344,7 @@ static void do_sig(int sig) case SIGALRM: case SIGUSR1: case SIGINT: + case SIGTERM: return finish(); case SIGUSR2: return flush(); @@ -3591,6 +3592,7 @@ static int create_recorder(struct buffer_instance *instance, int cpu, return pid; signal(SIGINT, SIG_IGN); + signal(SIGTERM, SIG_IGN); signal(SIGUSR1, do_sig); signal(SIGUSR2, do_sig); signal(SIGALRM, do_sig); @@ -7146,6 +7148,7 @@ static void record_trace(int argc, char **argv, if (type & (TRACE_TYPE_RECORD | TRACE_TYPE_STREAM)) { signal(SIGINT, do_sig); + signal(SIGTERM, do_sig); if (!latency) start_threads(type, ctx); } @@ -7182,7 +7185,7 @@ static void record_trace(int argc, char **argv, if (do_daemonize) { daemonize_finish(); - printf("Send SIGINT to pid %d to stop recording\n", getpid()); + printf("Send SIGINT/SIGTERM to pid %d to stop recording\n", getpid()); } else { /* sleep till we are woken with Ctrl^C */ printf("Hit Ctrl^C to stop recording\n"); From patchwork Tue Oct 17 23:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13426202 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DD892F528 for ; Tue, 17 Oct 2023 23:33:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0938AC433C8; Tue, 17 Oct 2023 23:33:27 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qstaa-009G0R-39; Tue, 17 Oct 2023 19:35:04 -0400 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Cc: Avidan Borisov , Ross Zwisler , "Steven Rostedt (Google)" Subject: [PATCH 2/2] trace-cmd record: Cleanup - be consistent with return status variable Date: Tue, 17 Oct 2023 19:20:29 -0400 Message-ID: <20231017233503.2205514-3-rostedt@goodmis.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231017233503.2205514-1-rostedt@goodmis.org> References: <20231017233503.2205514-1-rostedt@goodmis.org> Precedence: bulk X-Mailing-List: linux-trace-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Steven Rostedt (Google)" The variable that checks return status in daemonize_start() is "rc". To be consistent with the rest of the code, change it to "ret". Also check for less than zero instead of -1. Signed-off-by: Steven Rostedt (Google) --- tracecmd/trace-record.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index c943f486291e..022c27ffc294 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -1655,7 +1655,7 @@ static void daemonize_start(void) int devnull; int status; int pid; - int rc; + int ret; pid = fork(); if (pid == -1) @@ -1719,12 +1719,12 @@ static void daemonize_start(void) die("daemonize: sigaction failed"); do { - rc = waitpid(pid, &status, 0); - } while (!child_detached && ((rc == -1) && (errno == EINTR))); + ret = waitpid(pid, &status, 0); + } while (!child_detached && ((ret < 0) && (errno == EINTR))); if (child_detached) exit(0); - else if (rc == pid) + else if (ret == pid) exit(WIFEXITED(status)); else die("daemonize: waitpid failed");