X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_pdump.c;h=ea03056b475df78557edfdd931a8ba88254f4ea5;hb=a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6;hp=4a894c0e1b196f5547bbf5007763ca76990e69b0;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c index 4a894c0e1b..ea03056b47 100644 --- a/app/test/test_pdump.c +++ b/app/test/test_pdump.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #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++) { @@ -152,11 +147,19 @@ send_pkts(void *empty) ret = test_get_mbuf_from_pool(&mp, pbuf, poolname); if (ret < 0) printf("get_mbuf_from_pool failed\n"); - do { + + ret = test_dev_start(portid, mp); + if (ret < 0) + printf("test_dev_start(%hu, %p) failed, error code: %d\n", + portid, mp, ret); + + while (ret >= 0 && flag_for_send_pkts) { ret = test_packet_forward(pbuf, portid, QUEUE_ID); if (ret < 0) printf("send pkts Failed\n"); - } while (flag_for_send_pkts); + }; + + rte_eth_dev_stop(portid); test_put_mbuf_to_pool(mp, pbuf); return empty; } @@ -172,7 +175,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 +192,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);