X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring_stress_impl.h;h=f9ca63b908ddfee04fa728f68b0f5150cf52b6c3;hb=c17af95a19e30c8d89eb96ceca99f60474ca2ac4;hp=222d62bc4f4de93d70bfcdb448671ada4416b10c;hpb=bf28df24e915dbe62a94e38a7c2280a8929b846b;p=dpdk.git diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h index 222d62bc4f..f9ca63b908 100644 --- a/app/test/test_ring_stress_impl.h +++ b/app/test/test_ring_stress_impl.h @@ -6,7 +6,7 @@ /** * Stress test for ring enqueue/dequeue operations. - * Performs the following pattern on each slave worker: + * Performs the following pattern on each worker: * dequeue/read-write data from the dequeued objects/enqueue. * Serves as both functional and performance test of ring * enqueue/dequeue operations under high contention @@ -159,7 +159,7 @@ check_updt_elem(struct ring_elem *elm[], uint32_t num, "offending object: %p\n", __func__, rte_lcore_id(), num, i, elm[i]); rte_memdump(stdout, "expected", check, sizeof(*check)); - rte_memdump(stdout, "result", elm[i], sizeof(elm[i])); + rte_memdump(stdout, "result", elm[i], sizeof(*elm[i])); rte_spinlock_unlock(&dump_lock); return -EINVAL; } @@ -348,8 +348,8 @@ test_mt1(int (*test)(void *)) memset(arg, 0, sizeof(arg)); - /* launch on all slaves */ - RTE_LCORE_FOREACH_SLAVE(lc) { + /* launch on all workers */ + RTE_LCORE_FOREACH_WORKER(lc) { arg[lc].rng = r; arg[lc].stats = init_stat; rte_eal_remote_launch(test, &arg[lc], lc); @@ -365,12 +365,12 @@ test_mt1(int (*test)(void *)) wrk_cmd = WRK_CMD_STOP; rte_smp_wmb(); - /* wait for slaves and collect stats. */ + /* wait for workers and collect stats. */ mc = rte_lcore_id(); arg[mc].stats = init_stat; rc = 0; - RTE_LCORE_FOREACH_SLAVE(lc) { + RTE_LCORE_FOREACH_WORKER(lc) { rc |= rte_eal_wait_lcore(lc); lcore_stat_aggr(&arg[mc].stats, &arg[lc].stats); if (verbose != 0)