From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Olivier Matz <olivier.matz@6wind.com>
Subject: [PATCH v3 3/3] testpmd: enable interrupt in interactive mode
Date: Tue, 14 Mar 2023 10:36:48 -0700 [thread overview]
Message-ID: <20230314173648.69528-4-stephen@networkplumber.org> (raw)
In-Reply-To: <20230314173648.69528-1-stephen@networkplumber.org>
The setting in terminal handling for both Unix style and
Windows was not ensuring that Ctrl-C character would
cause interrupt.
This is a first release bug. Testpmd interactive mode has
always disabled control-c handling on Linux.
Fixes: af75078fece3 ("first public release")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/cmdline/cmdline_os_unix.c | 3 ++-
lib/cmdline/cmdline_os_windows.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
index 5f9839a15f98..356c5b3f3ca2 100644
--- a/lib/cmdline/cmdline_os_unix.c
+++ b/lib/cmdline/cmdline_os_unix.c
@@ -16,7 +16,8 @@ terminal_adjust(struct cmdline *cl)
tcgetattr(0, &cl->oldterm);
memcpy(&term, &cl->oldterm, sizeof(term));
- term.c_lflag &= ~(ICANON | ECHO | ISIG);
+ term.c_lflag &= ~(ICANON | ECHO);
+ term.c_lflag |= ISIG;
tcsetattr(0, TCSANOW, &term);
setbuf(stdin, NULL);
diff --git a/lib/cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c
index 80863bfc8a00..8cff3b175747 100644
--- a/lib/cmdline/cmdline_os_windows.c
+++ b/lib/cmdline/cmdline_os_windows.c
@@ -32,10 +32,10 @@ terminal_adjust(struct cmdline *cl)
mode &= ~(
ENABLE_LINE_INPUT | /* no line buffering */
ENABLE_ECHO_INPUT | /* no echo */
- ENABLE_PROCESSED_INPUT | /* pass Ctrl+C to program */
ENABLE_MOUSE_INPUT | /* no mouse events */
ENABLE_WINDOW_INPUT); /* no window resize events */
- mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+ mode |= ENABLE_VIRTUAL_TERMINAL_INPUT |
+ ENABLE_PROCESSED_INPUT; /* Ctrl C processed by the system */
SetConsoleMode(handle, mode);
}
--
2.39.2
next prev parent reply other threads:[~2023-03-14 17:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 17:19 [RFT] test-pmd: go back to using cmdline_interact Stephen Hemminger
2023-03-13 21:38 ` [RFT v2] " Stephen Hemminger
2023-03-14 7:06 ` Ling, WeiX
[not found] ` <MW4PR12MB56684FA660218F925D64BE09A4BE9@MW4PR12MB5668.namprd12.prod.outlook.com>
2023-03-14 12:07 ` Pier Damouny
2023-03-14 17:36 ` [PATCH v3 0/3] testpmd control C fixes Stephen Hemminger
2023-03-14 17:36 ` [PATCH v3 1/3] testpmd: go back to using cmdline_interact Stephen Hemminger
2023-03-14 17:36 ` [PATCH v3 2/3] testpmd: use sig_atomic_t for flag Stephen Hemminger
2023-03-15 16:31 ` Stephen Hemminger
2023-03-14 17:36 ` Stephen Hemminger [this message]
2023-03-14 22:40 ` [PATCH v3 0/3] testpmd control C fixes Stephen Hemminger
2023-03-15 9:46 ` David Marchand
2023-03-15 17:31 ` [PATCH v4 0/2] Fix testpmd interrupt regression Stephen Hemminger
2023-03-15 17:31 ` [PATCH v4 1/2] testpmd: go back to using cmdline_interact Stephen Hemminger
2023-03-17 16:20 ` Olivier Matz
2023-03-17 16:38 ` Stephen Hemminger
2023-03-15 17:31 ` [PATCH v4 2/2] testpmd: enable interrupt in interactive mode Stephen Hemminger
2023-03-17 16:20 ` Olivier Matz
2023-03-17 16:25 ` Stephen Hemminger
2023-03-16 8:16 ` [PATCH v4 0/2] Fix testpmd interrupt regression Pier Damouny
2023-03-16 12:20 ` Ferruh Yigit
2023-03-16 15:31 ` Stephen Hemminger
2023-03-16 17:01 ` Ferruh Yigit
2023-03-16 17:05 ` Thomas Monjalon
2023-03-16 17:36 ` Ferruh Yigit
2023-03-16 17:27 ` [PATCH] app/testpmd: revert cleanup cleanly from signal Ferruh Yigit
2023-03-17 16:59 ` [PATCH v5] testpmd: go back to using cmdline_interact Stephen Hemminger
2023-03-17 21:12 ` Olivier Matz
2023-03-19 23:28 ` 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=20230314173648.69528-4-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=olivier.matz@6wind.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).