Imported Upstream version 17.05

[deb_dpdk.git] / test / test / test_ring_perf.c

diff --git a/app/test/test_ring_perf.c b/test/test/test_ring_perf.c
similarity index 92%
rename from app/test/test_ring_perf.c
rename to test/test/test_ring_perf.c
index 320c20c..ed89896 100644 (file)
--- a/app/test/test_ring_perf.c
+++ b/test/test/test_ring_perf.c
@@ -152,12 +152,12 @@ test_empty_dequeue(void)
 
        const uint64_t sc_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               rte_ring_sc_dequeue_bulk(r, burst, bulk_sizes[0]);
+               rte_ring_sc_dequeue_bulk(r, burst, bulk_sizes[0], NULL);
        const uint64_t sc_end = rte_rdtsc();
 
        const uint64_t mc_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               rte_ring_mc_dequeue_bulk(r, burst, bulk_sizes[0]);
+               rte_ring_mc_dequeue_bulk(r, burst, bulk_sizes[0], NULL);
        const uint64_t mc_end = rte_rdtsc();
 
        printf("SC empty dequeue: %.2F\n",
@@ -195,13 +195,13 @@ enqueue_bulk(void *p)
 
        const uint64_t sp_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               while (rte_ring_sp_enqueue_bulk(r, burst, size) != 0)
+               while (rte_ring_sp_enqueue_bulk(r, burst, size, NULL) == 0)
                        rte_pause();
        const uint64_t sp_end = rte_rdtsc();
 
        const uint64_t mp_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               while (rte_ring_mp_enqueue_bulk(r, burst, size) != 0)
+               while (rte_ring_mp_enqueue_bulk(r, burst, size, NULL) == 0)
                        rte_pause();
        const uint64_t mp_end = rte_rdtsc();
 
@@ -230,13 +230,13 @@ dequeue_bulk(void *p)
 
        const uint64_t sc_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               while (rte_ring_sc_dequeue_bulk(r, burst, size) != 0)
+               while (rte_ring_sc_dequeue_bulk(r, burst, size, NULL) == 0)
                        rte_pause();
        const uint64_t sc_end = rte_rdtsc();
 
        const uint64_t mc_start = rte_rdtsc();
        for (i = 0; i < iterations; i++)
-               while (rte_ring_mc_dequeue_bulk(r, burst, size) != 0)
+               while (rte_ring_mc_dequeue_bulk(r, burst, size, NULL) == 0)
                        rte_pause();
        const uint64_t mc_end = rte_rdtsc();
 
@@ -323,15 +323,19 @@ test_burst_enqueue_dequeue(void)
        for (sz = 0; sz < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); sz++) {
                const uint64_t sc_start = rte_rdtsc();
                for (i = 0; i < iterations; i++) {
-                       rte_ring_sp_enqueue_burst(r, burst, bulk_sizes[sz]);
-                       rte_ring_sc_dequeue_burst(r, burst, bulk_sizes[sz]);
+                       rte_ring_sp_enqueue_burst(r, burst,
+                                       bulk_sizes[sz], NULL);
+                       rte_ring_sc_dequeue_burst(r, burst,
+                                       bulk_sizes[sz], NULL);
                }
                const uint64_t sc_end = rte_rdtsc();
 
                const uint64_t mc_start = rte_rdtsc();
                for (i = 0; i < iterations; i++) {
-                       rte_ring_mp_enqueue_burst(r, burst, bulk_sizes[sz]);
-                       rte_ring_mc_dequeue_burst(r, burst, bulk_sizes[sz]);
+                       rte_ring_mp_enqueue_burst(r, burst,
+                                       bulk_sizes[sz], NULL);
+                       rte_ring_mc_dequeue_burst(r, burst,
+                                       bulk_sizes[sz], NULL);
                }
                const uint64_t mc_end = rte_rdtsc();
 
@@ -357,15 +361,19 @@ test_bulk_enqueue_dequeue(void)
        for (sz = 0; sz < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); sz++) {
                const uint64_t sc_start = rte_rdtsc();
                for (i = 0; i < iterations; i++) {
-                       rte_ring_sp_enqueue_bulk(r, burst, bulk_sizes[sz]);
-                       rte_ring_sc_dequeue_bulk(r, burst, bulk_sizes[sz]);
+                       rte_ring_sp_enqueue_bulk(r, burst,
+                                       bulk_sizes[sz], NULL);
+                       rte_ring_sc_dequeue_bulk(r, burst,
+                                       bulk_sizes[sz], NULL);
                }
                const uint64_t sc_end = rte_rdtsc();
 
                const uint64_t mc_start = rte_rdtsc();
                for (i = 0; i < iterations; i++) {
-                       rte_ring_mp_enqueue_bulk(r, burst, bulk_sizes[sz]);
-                       rte_ring_mc_dequeue_bulk(r, burst, bulk_sizes[sz]);
+                       rte_ring_mp_enqueue_bulk(r, burst,
+                                       bulk_sizes[sz], NULL);
+                       rte_ring_mc_dequeue_bulk(r, burst,
+                                       bulk_sizes[sz], NULL);
                }
                const uint64_t mc_end = rte_rdtsc();