From: Stephen Hemminger <stephen@networkplumber.org>
To: Zhihong Wang <zhihong.wang@intel.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2 1/3] app/test-pmd: Handle SIGINT and SIGTERM in testpmd
Date: Sun, 27 Dec 2015 13:42:09 -0800 [thread overview]
Message-ID: <20151227134209.15dc44ba@xeon-e3> (raw)
In-Reply-To: <1451011032-83106-2-git-send-email-zhihong.wang@intel.com>
On Thu, 24 Dec 2015 21:37:10 -0500
Zhihong Wang <zhihong.wang@intel.com> wrote:
> Handle SIGINT and SIGTERM in testpmd.
>
> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
> ---
> app/test-pmd/cmdline.c | 19 +++++++++++++------
> app/test-pmd/testpmd.c | 38 ++++++++++++++++++++++++++++++++------
> app/test-pmd/testpmd.h | 1 +
> 3 files changed, 46 insertions(+), 12 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 73298c9..4ff1739 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -90,6 +90,8 @@
>
> #include "testpmd.h"
>
> +static struct cmdline *testpmd_cl;
> +
> static void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
>
> #ifdef RTE_NIC_BYPASS
> @@ -9778,17 +9780,22 @@ cmdline_parse_ctx_t main_ctx[] = {
> void
> prompt(void)
> {
> - struct cmdline *cl;
> -
> /* initialize non-constant commands */
> cmd_set_fwd_mode_init();
>
> - cl = cmdline_stdin_new(main_ctx, "testpmd> ");
> - if (cl == NULL) {
> + testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
> + if (testpmd_cl == NULL) {
> return;
> }
Style nit: don't need {} around single statement.
> - cmdline_interact(cl);
> - cmdline_stdin_exit(cl);
> + cmdline_interact(testpmd_cl);
> + cmdline_stdin_exit(testpmd_cl);
> +}
> +
> +void
> +prompt_exit(void)
> +{
> + if (testpmd_cl != NULL)
> + cmdline_quit(testpmd_cl);
> }
>
> static void
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index 98ae46d..cb38d56 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -1570,13 +1570,16 @@ pmd_test_exit(void)
> if (test_done == 0)
> stop_packet_forwarding();
>
> - FOREACH_PORT(pt_id, ports) {
> - printf("Stopping port %d...", pt_id);
> - fflush(stdout);
> - rte_eth_dev_close(pt_id);
> - printf("done\n");
> + if (ports != NULL) {
> + FOREACH_PORT(pt_id, ports) {
> + printf("Stopping port %d...", pt_id);
> + fflush(stdout);
> + rte_eth_dev_stop(pt_id);
> + rte_eth_dev_close(pt_id);
> + printf(" Done\n");
> + }
> }
> - printf("bye...\n");
> + printf("Bye...\n");
> }
>
> typedef void (*cmd_func_t)(void);
> @@ -1984,12 +1987,34 @@ init_port(void)
> ports[pid].enabled = 1;
> }
>
> +static void
> +force_quit(void)
> +{
> + pmd_test_exit();
> + prompt_exit();
> +}
> +
> +static void
> +sigint_handler(__rte_unused int signum)
> +{
> + if (signum == SIGINT || signum == SIGTERM) {
signmum is used, so don't want __rte_unused
> + printf("\nSignal %d received, preparing to exit...\n",
> + signum);
> + force_quit();
> + signal(signum, SIG_DFL);
> + kill(getpid(), signum);
> + }
> +}
> +
> int
> main(int argc, char** argv)
> {
> int diag;
> uint8_t port_id;
>
> + signal(SIGINT, sigint_handler);
> + signal(SIGTERM, sigint_handler);
> +
> diag = rte_eal_init(argc, argv);
> if (diag < 0)
> rte_panic("Cannot init EAL\n");
> @@ -2041,6 +2066,7 @@ main(int argc, char** argv)
> start_packet_forwarding(0);
> printf("Press enter to exit\n");
> rc = read(0, &c, 1);
> + pmd_test_exit();
> if (rc < 0)
> return 1;
> }
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> index ee7de98..7ffc17b 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -462,6 +462,7 @@ unsigned int parse_item_list(char* str, const char* item_name,
> unsigned int *parsed_items, int check_unique_values);
> void launch_args_parse(int argc, char** argv);
> void prompt(void);
> +void prompt_exit(void);
> void nic_stats_display(portid_t port_id);
> void nic_stats_clear(portid_t port_id);
> void nic_xstats_display(portid_t port_id);
next prev parent reply other threads:[~2015-12-27 21:42 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 [this message]
2015-12-28 1:37 ` Wang, Zhihong
2015-12-25 2:37 ` [dpdk-dev] [PATCH v2 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd Zhihong Wang
2015-12-27 21:49 ` 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=20151227134209.15dc44ba@xeon-e3 \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=zhihong.wang@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).