From patchwork Fri Dec 25 02:37:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihong Wang X-Patchwork-Id: 9665 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 059A48E6A; Fri, 25 Dec 2015 10:40:40 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 607445A89 for ; Fri, 25 Dec 2015 10:40:37 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 25 Dec 2015 01:40:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,478,1444719600"; d="scan'208";a="878462064" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.244]) by orsmga002.jf.intel.com with ESMTP; 25 Dec 2015 01:40:29 -0800 From: Zhihong Wang To: dev@dpdk.org Date: Thu, 24 Dec 2015 21:37:11 -0500 Message-Id: <1451011032-83106-3-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451011032-83106-1-git-send-email-zhihong.wang@intel.com> References: <1451011032-83106-1-git-send-email-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Handle SIGINT and SIGTERM in l2fwd. Signed-off-by: Zhihong Wang --- 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 #include #include +#include +#include #include #include @@ -69,6 +71,9 @@ #include #include +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; }