DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	Isaac Boukris <iboukris@gmail.com>,
	Reshma Pattan <reshma.pattan@intel.com>
Subject: [PATCH 1/2] app/dumpcap: handle SIGTERM and SIGHUP
Date: Mon, 26 Feb 2024 12:49:48 -0800	[thread overview]
Message-ID: <20240226205143.66702-2-stephen@networkplumber.org> (raw)
In-Reply-To: <20240226205143.66702-1-stephen@networkplumber.org>

If application is killed (SIGTERM), or the console session
ends (SIGHUP) or the write to the output file fails (SIGPIPE)
then do cleanup before exiting.

This also makes DPDK dumpcap behave more like Wireshark dumpcap.

Suggested-by: Isaac Boukris <iboukris@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/dumpcap/main.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index d57db0589a3f..76c747511444 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -939,6 +939,11 @@ int main(int argc, char **argv)
 {
 	struct rte_ring *r;
 	struct rte_mempool *mp;
+	struct sigaction action = {
+		.sa_flags = SA_RESTART,
+		.sa_handler = signal_handler,
+	};
+	struct sigaction origaction;
 	dumpcap_out_t out;
 	char *p;
 
@@ -964,8 +969,13 @@ int main(int argc, char **argv)
 
 	compile_filters();
 
-	signal(SIGINT, signal_handler);
-	signal(SIGPIPE, SIG_IGN);
+	sigemptyset(&action.sa_mask);
+	sigaction(SIGTERM, &action, NULL);
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGPIPE, &action, NULL);
+	sigaction(SIGHUP, NULL, &origaction);
+	if (origaction.sa_handler == SIG_DFL)
+		sigaction(SIGHUP, &action, NULL);
 
 	enable_primary_monitor();
 
-- 
2.43.0


  reply	other threads:[~2024-02-26 20:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 20:49 [PATCH 0/2] dumpcap,pdump handle cleanup signals Stephen Hemminger
2024-02-26 20:49 ` Stephen Hemminger [this message]
2024-02-26 20:49 ` [PATCH 2/2] app/pdump: handle SIGTERM and SIGHUP Stephen Hemminger
2024-02-27  9:59   ` Pattan, Reshma
2024-02-27 18:09     ` Stephen Hemminger
2024-05-29 16:08 ` [PATCH v2 0/2] Fix pdump and dumpcap leaks on SIGTERM Stephen Hemminger
2024-05-29 16:08   ` [PATCH v2 1/2] app/dumpcap: handle SIGTERM and SIGHUP Stephen Hemminger
2024-05-29 16:08   ` [PATCH v2 2/2] app/pdump: " Stephen Hemminger
2024-07-03 15:45   ` [PATCH v3 0/3] dumpcap and pdump patches for 24.07 Stephen Hemminger
2024-07-03 15:45     ` [PATCH v3 1/3] app/dumpcap: handle SIGTERM and SIGHUP Stephen Hemminger
2024-07-03 15:45     ` [PATCH v3 2/3] app/pdump: " Stephen Hemminger
2024-07-03 15:45     ` [PATCH v3 3/3] dumpcap: add lcores option Stephen Hemminger
2024-07-23 13:22     ` [PATCH v3 0/3] dumpcap and pdump patches for 24.07 Thomas Monjalon

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=20240226205143.66702-2-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=dev@dpdk.org \
    --cc=iboukris@gmail.com \
    --cc=reshma.pattan@intel.com \
    /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).