app/eventdev: use proper teardown sequence

Use proper teardown sequence when SIGINT is caught to prevent
eventdev from going into undefined state.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

diff --git a/app/test-eventdev/evt_main.c b/app/test-eventdev/evt_main.c
index 57bb94570f9e3b770ce610b4c9cef08e9191ac5d..a8d304bab31c01d208633fba299bc3b83a9d4133 100644 (file)
--- a/app/test-eventdev/evt_main.c
+++ b/app/test-eventdev/evt_main.c
@@ -20,29 +20,41 @@ struct evt_test *test;
 static void
 signal_handler(int signum)
 {
-       if (signum == SIGINT || signum == SIGTERM) {
+       int i;
+       static uint8_t once;
+
+       if ((signum == SIGINT || signum == SIGTERM) && !once) {
+               once = true;
                printf("\nSignal %d received, preparing to exit...\n",
                                signum);
-               /* request all lcores to exit from the main loop */
-               *(int *)test->test_priv = true;
-               rte_wmb();
 
-               rte_eal_mp_wait_lcore();
+               if (test != NULL) {
+                       /* request all lcores to exit from the main loop */
+                       *(int *)test->test_priv = true;
+                       rte_wmb();
+
+                       if (test->ops.ethdev_destroy)
+                               test->ops.ethdev_destroy(test, &opt);
 
-               if (test->ops.test_result)
-                       test->ops.test_result(test, &opt);
+                       rte_eal_mp_wait_lcore();
 
-               if (test->ops.eventdev_destroy)
-                       test->ops.eventdev_destroy(test, &opt);
+                       if (test->ops.test_result)
+                               test->ops.test_result(test, &opt);
 
-               if (test->ops.ethdev_destroy)
-                       test->ops.ethdev_destroy(test, &opt);
+                       if (opt.prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR) {
+                               RTE_ETH_FOREACH_DEV(i)
+                                       rte_eth_dev_close(i);
+                       }
 
-               if (test->ops.mempool_destroy)
-                       test->ops.mempool_destroy(test, &opt);
+                       if (test->ops.eventdev_destroy)
+                               test->ops.eventdev_destroy(test, &opt);
 
-               if (test->ops.test_destroy)
-                       test->ops.test_destroy(test, &opt);
+                       if (test->ops.mempool_destroy)
+                               test->ops.mempool_destroy(test, &opt);
+
+                       if (test->ops.test_destroy)
+                               test->ops.test_destroy(test, &opt);
+               }
 
                /* exit with the expected status */
                signal(signum, SIG_DFL);

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index d0d835d5ebead6fb2be7f5e39f0639b17b87a507..d33cb2cd39a29237a71ac5d3cd09bb3654ee74a4 100644 (file)
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -750,7 +750,6 @@ void perf_ethdev_destroy(struct evt_test *test, struct evt_options *opt)
                RTE_ETH_FOREACH_DEV(i) {
                        rte_event_eth_rx_adapter_stop(i);
                        rte_eth_dev_stop(i);
-                       rte_eth_dev_close(i);
                }
        }
 }

diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c
index 239c953e611667e726db79fe5c2a58fc106eed3a..a54068df3b8c33d4a9d4c7b57d927a02f37b5262 100644 (file)
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -477,7 +477,6 @@ pipeline_ethdev_destroy(struct evt_test *test, struct evt_options *opt)
        RTE_ETH_FOREACH_DEV(i) {
                rte_event_eth_rx_adapter_stop(i);
                rte_eth_dev_stop(i);
-               rte_eth_dev_close(i);
        }
 }