On 11/9/22 20:29, Stephen Hemminger wrote:
Do a clean shutdown of testpmd when a signal is received; instead of having testpmd kill itself. This fixes problem where a signal could be received in the middle of a PMD and then the signal handler would call PMD's close routine which could cause a deadlock.Added benefit is it gets rid of Windows specific code. Fixes: d9a191a00e81 ("app/testpmd: fix quitting in container")
Cc to stable?
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
with one nit below: Reviewed-by: Andrew Rybchenko <andrew.rybche...@oktetlabs.ru> [snip]
@@ -4476,15 +4459,37 @@ main(int argc, char** argv) prev_time = cur_time; rte_delay_us_sleep(US_PER_S); } - } + } else { + char c; + fd_set fds;- printf("Press enter to exit\n");- rc = read(0, &c, 1); - pmd_test_exit(); - if (rc < 0) - return 1; + printf("Press enter to exit\n"); + + FD_ZERO(&fds); + FD_SET(0, &fds); + + if (select(1, &fds, NULL, NULL, NULL) <= 0) { + fprintf(stderr, "Select failed: %s\n", + strerror(errno)); + } else if (read(0, &c, 1) <= 0) { + fprintf(stderr, + "Read stdin failed: %s\n", + strerror(errno)); + } + } + stop_packet_forwarding();
force_quit() calls stop_packet_forwarding() if test_done is 0. So, there is no difference in test_done == 0 case. If test_done is not zero, stop_packet_forwarding() just logs "Packet forwarding not started" and does nothing. So, the difference is only in error message. Is it intentional?
+ force_quit(); }+#ifdef RTE_LIB_PDUMP+ /* uninitialize packet capture framework */ + rte_pdump_uninit(); +#endif +#ifdef RTE_LIB_LATENCYSTATS + if (latencystats_enabled != 0) + rte_latencystats_uninit(); +#endif + ret = rte_eal_cleanup(); if (ret != 0) rte_exit(EXIT_FAILURE,

