test/crypto: add packet soft expiry cases

[dpdk.git] / app / test / test_pdump.c

diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c
index 4a894c0..b49fcfb 100644 (file)
--- a/app/test/test_pdump.c
+++ b/app/test/test_pdump.c
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_pdump.h>
 #include "rte_eal.h"
 #include "rte_lcore.h"
@@ -18,8 +18,7 @@
 #include "process.h"
 #include "test_pdump.h"
 
-#define launch_p(ARGV) process_dup(ARGV, \
-               sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
+#define launch_p(ARGV) process_dup(ARGV, RTE_DIM(ARGV), __func__)
 
 struct rte_ring *ring_server;
 uint16_t portid;
@@ -58,8 +57,7 @@ run_pdump_client_tests(void)
        if (ret < 0)
                return -1;
        mp->flags = 0x0000;
-       ring_client = rte_ring_create("SR0", RING_SIZE, rte_socket_id(),
-                                     RING_F_SP_ENQ | RING_F_SC_DEQ);
+       ring_client = rte_ring_create("SR0", RING_SIZE, rte_socket_id(), 0);
        if (ring_client == NULL) {
                printf("rte_ring_create SR0 failed");
                return -1;
@@ -72,9 +70,6 @@ run_pdump_client_tests(void)
        }
        rte_eth_dev_probing_finish(eth_dev);
 
-       ring_client->prod.single = 0;
-       ring_client->cons.single = 0;
-
        printf("\n***** flags = RTE_PDUMP_FLAG_TX *****\n");
 
        for (itr = 0; itr < NUM_ITR; itr++) {
@@ -172,7 +167,7 @@ run_pdump_server_tests(void)
        int ret = 0;
        char coremask[10];
 
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
        char tmp[PATH_MAX] = { 0 };
        char prefix[PATH_MAX] = { 0 };
 
@@ -189,7 +184,7 @@ run_pdump_server_tests(void)
        };
 
        snprintf(coremask, sizeof(coremask), "%x",
-                (1 << rte_get_master_lcore()));
+                (1 << rte_get_main_lcore()));
 
        ret = test_pdump_init();
        ret |= launch_p(argv1);