From: Zhihong Wang <zhihong.wang@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd
Date: Thu, 24 Dec 2015 21:37:11 -0500 [thread overview]
Message-ID: <1451011032-83106-3-git-send-email-zhihong.wang@intel.com> (raw)
In-Reply-To: <1451011032-83106-1-git-send-email-zhihong.wang@intel.com>
Handle SIGINT and SIGTERM in l2fwd.
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
---
examples/l2fwd/main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 720fd5a..75899dd 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -44,6 +44,8 @@
#include <ctype.h>
#include <errno.h>
#include <getopt.h>
+#include <signal.h>
+#include <unistd.h>
#include <rte_common.h>
#include <rte_log.h>
@@ -69,6 +71,9 @@
#include <rte_mempool.h>
#include <rte_mbuf.h>
+static int force_quit = -1;
+static int signo_quit = -1;
+
#define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
#define NB_MBUF 8192
@@ -284,6 +289,8 @@ l2fwd_main_loop(void)
}
while (1) {
+ if (unlikely(force_quit != 0))
+ break;
cur_tsc = rte_rdtsc();
@@ -534,6 +541,45 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
}
}
+static void
+stop_ports(void)
+{
+ unsigned portid, nb_ports;
+
+ nb_ports = rte_eth_dev_count();
+ for (portid = 0; portid < nb_ports; portid++) {
+ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
+ continue;
+ }
+ printf("Stopping port %d...", portid);
+ rte_eth_dev_stop(portid);
+ rte_eth_dev_close(portid);
+ printf(" Done\n");
+ }
+}
+
+static void
+signal_handler(__rte_unused int signum)
+{
+ if (signum == SIGINT || signum == SIGTERM) {
+ printf("\nSignal %d received, preparing to exit...\n",
+ signum);
+ if (force_quit < 0) {
+ printf("Forwarding not started yet...\n");
+ /* stop ports */
+ stop_ports();
+ printf("Bye...\n");
+ /* inform if there's a caller */
+ signal(signum, SIG_DFL);
+ kill(getpid(), signum);
+ } else {
+ printf("Forwarding started already...\n");
+ signo_quit = signum;
+ force_quit = 1;
+ }
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -546,6 +592,9 @@ main(int argc, char **argv)
unsigned lcore_id, rx_lcore_id;
unsigned nb_ports_in_mask = 0;
+ signal(SIGINT, signal_handler);
+ signal(SIGTERM, signal_handler);
+
/* init EAL */
ret = rte_eal_init(argc, argv);
if (ret < 0)
@@ -697,11 +746,22 @@ main(int argc, char **argv)
check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask);
/* launch per-lcore init on every lcore */
+ force_quit = 0;
rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MASTER);
RTE_LCORE_FOREACH_SLAVE(lcore_id) {
if (rte_eal_wait_lcore(lcore_id) < 0)
return -1;
}
+ printf("Stopping forwarding... Done\n");
+ /* stop ports */
+ stop_ports();
+ printf("Bye...\n");
+ /* inform if there's a caller */
+ if (force_quit != 0) {
+ signal(signo_quit, SIG_DFL);
+ kill(getpid(), signo_quit);
+ }
+
return 0;
}
--
2.5.0
next prev parent reply other threads:[~2015-12-25 9:40 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-25 2:37 [dpdk-dev] [PATCH v2 0/3] Handle SIGINT and SIGTERM in DPDK examples Zhihong Wang
2015-12-25 2:37 ` [dpdk-dev] [PATCH v2 1/3] app/test-pmd: Handle SIGINT and SIGTERM in testpmd Zhihong Wang
2015-12-27 21:42 ` Stephen Hemminger
2015-12-28 1:37 ` Wang, Zhihong
2015-12-25 2:37 ` Zhihong Wang [this message]
2015-12-27 21:49 ` [dpdk-dev] [PATCH v2 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd Stephen Hemminger
2015-12-28 1:35 ` Wang, Zhihong
2015-12-25 2:37 ` [dpdk-dev] [PATCH v2 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd Zhihong Wang
2015-12-28 4:17 ` [dpdk-dev] [PATCH v2 0/3] Handle SIGINT and SIGTERM in DPDK examples Qiu, Michael
2015-12-28 9:51 ` Wang, Zhihong
2015-12-29 1:20 ` [dpdk-dev] [PATCH v3 " Zhihong Wang
2015-12-29 1:20 ` [dpdk-dev] [PATCH v3 1/3] app/test-pmd: Handle SIGINT and SIGTERM in testpmd Zhihong Wang
2015-12-29 1:20 ` [dpdk-dev] [PATCH v3 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd Zhihong Wang
2015-12-30 17:35 ` Stephen Hemminger
2015-12-29 1:20 ` [dpdk-dev] [PATCH v3 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd Zhihong Wang
2015-12-29 13:34 ` Ananyev, Konstantin
2015-12-30 3:15 ` Wang, Zhihong
2015-12-30 11:29 ` Ananyev, Konstantin
2015-12-31 2:14 ` Wang, Zhihong
2015-12-30 17:37 ` Stephen Hemminger
2015-12-29 23:27 ` [dpdk-dev] [PATCH v4 0/3] Handle SIGINT and SIGTERM in DPDK examples Zhihong Wang
2015-12-29 23:27 ` [dpdk-dev] [PATCH v4 1/3] app/test-pmd: Handle SIGINT and SIGTERM in testpmd Zhihong Wang
2015-12-29 23:27 ` [dpdk-dev] [PATCH v4 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd Zhihong Wang
2015-12-29 23:27 ` [dpdk-dev] [PATCH v4 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd Zhihong Wang
2015-12-30 13:37 ` Ananyev, Konstantin
2015-12-31 1:44 ` Wang, Zhihong
2015-12-31 2:09 ` Stephen Hemminger
2015-12-31 2:20 ` Wang, Zhihong
2015-12-30 21:59 ` [dpdk-dev] [PATCH v5 0/3] Handle SIGINT and SIGTERM in DPDK examples Zhihong Wang
2015-12-30 21:59 ` [dpdk-dev] [PATCH v5 1/3] app/test-pmd: Handle SIGINT and SIGTERM in testpmd Zhihong Wang
2015-12-30 21:59 ` [dpdk-dev] [PATCH v5 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd Zhihong Wang
2015-12-31 17:01 ` Stephen Hemminger
2016-01-04 2:00 ` Wang, Zhihong
2015-12-30 21:59 ` [dpdk-dev] [PATCH v5 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd Zhihong Wang
2016-01-06 13:51 ` Ananyev, Konstantin
2016-01-27 16:34 ` [dpdk-dev] [PATCH v5 0/3] Handle SIGINT and SIGTERM in DPDK examples 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=1451011032-83106-3-git-send-email-zhihong.wang@intel.com \
--to=zhihong.wang@intel.com \
--cc=dev@dpdk.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;
as well as URLs for NNTP newsgroup(s).