test mbuf attach

[dpdk.git] / app / test-eventdev / evt_main.c

diff --git a/app/test-eventdev/evt_main.c b/app/test-eventdev/evt_main.c
index 1c3a7fa..a8d304b 100644 (file)
--- a/app/test-eventdev/evt_main.c
+++ b/app/test-eventdev/evt_main.c
@@ -1,33 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium, Inc 2017.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Cavium, Inc nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
 
 #include <stdio.h>
@@ -48,26 +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);
+
+                       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);