app/testpmd: avoid exit without terminal restore
authorDapeng Yu <dapengx.yu@intel.com>
Mon, 25 Jan 2021 03:29:53 +0000 (11:29 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 29 Jan 2021 17:16:12 +0000 (18:16 +0100)
In interactive mode, if testpmd exit by calling rte_exit without
restore terminal attributes, terminal will not echo keyboard input.

register a function with atexit() in prompt(), when exit() in
rte_exit() is called, the registered function restores terminal
attributes.

Fixes: 5a8fb55c48ab ("app/testpmd: support unidirectional configuration")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>
app/test-pmd/cmdline.c

index b338f5f..789f35f 100644 (file)
@@ -17131,6 +17131,7 @@ cmdline_read_from_file(const char *filename)
 void
 prompt(void)
 {
+       int ret;
        /* initialize non-constant commands */
        cmd_set_fwd_mode_init();
        cmd_set_fwd_retry_mode_init();
@@ -17138,15 +17139,23 @@ prompt(void)
        testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
        if (testpmd_cl == NULL)
                return;
+
+       ret = atexit(prompt_exit);
+       if (ret != 0)
+               printf("Cannot set exit function for cmdline\n");
+
        cmdline_interact(testpmd_cl);
-       cmdline_stdin_exit(testpmd_cl);
+       if (ret != 0)
+               cmdline_stdin_exit(testpmd_cl);
 }
 
 void
 prompt_exit(void)
 {
-       if (testpmd_cl != NULL)
+       if (testpmd_cl != NULL) {
                cmdline_quit(testpmd_cl);
+               cmdline_stdin_exit(testpmd_cl);
+       }
 }
 
 static void