X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_rwlock.c;h=4ae0bf8deb34106f858e9ba02f13bc292c92f388;hb=a2dfcd1ff609f5a4fd3b65774618a35c5c9f73c6;hp=b47150a86a564320b553c61f9c81a9d115bd9350;hpb=14df4f2987fd9de51a026f2bbc94fbb7a7a1379a;p=dpdk.git

diff --git a/app/test/test_rwlock.c b/app/test/test_rwlock.c
index b47150a86a..4ae0bf8deb 100644
--- a/app/test/test_rwlock.c
+++ b/app/test/test_rwlock.c
@@ -13,7 +13,6 @@
 #include <rte_memory.h>
 #include <rte_per_lcore.h>
 #include <rte_launch.h>
-#include <rte_atomic.h>
 #include <rte_rwlock.h>
 #include <rte_eal.h>
 #include <rte_lcore.h>
@@ -36,7 +35,7 @@
 
 static rte_rwlock_t sl;
 static rte_rwlock_t sl_tab[RTE_MAX_LCORE];
-static rte_atomic32_t synchro;
+static uint32_t synchro;
 
 enum {
 	LC_TYPE_RDLOCK,
@@ -102,8 +101,7 @@ load_loop_fn(__rte_unused void *arg)
 
 	/* wait synchro for workers */
 	if (lcore != rte_get_main_lcore())
-		while (rte_atomic32_read(&synchro) == 0)
-			;
+		rte_wait_until_equal_32(&synchro, 1, __ATOMIC_RELAXED);
 
 	begin = rte_rdtsc_precise();
 	while (lcount < MAX_LOOP) {
@@ -136,12 +134,12 @@ test_rwlock_perf(void)
 	printf("\nRwlock Perf Test on %u cores...\n", rte_lcore_count());
 
 	/* clear synchro and start workers */
-	rte_atomic32_set(&synchro, 0);
+	__atomic_store_n(&synchro, 0, __ATOMIC_RELAXED);
 	if (rte_eal_mp_remote_launch(load_loop_fn, NULL, SKIP_MAIN) < 0)
 		return -1;
 
 	/* start synchro and launch test on main */
-	rte_atomic32_set(&synchro, 1);
+	__atomic_store_n(&synchro, 1, __ATOMIC_RELAXED);
 	load_loop_fn(NULL);
 
 	rte_eal_mp_wait_lcore();
@@ -508,48 +506,6 @@ try_rwlock_test_rde_wro(void)
 	return process_try_lcore_stats();
 }
 
-static int
-test_rwlock(void)
-{
-	uint32_t i;
-	int32_t rc, ret;
-
-	static const struct {
-		const char *name;
-		int (*ftst)(void);
-	} test[] = {
-		{
-			.name = "rwlock_test1",
-			.ftst = rwlock_test1,
-		},
-		{
-			.name = "try_rwlock_test_rda",
-			.ftst = try_rwlock_test_rda,
-		},
-		{
-			.name = "try_rwlock_test_rds_wrm",
-			.ftst = try_rwlock_test_rds_wrm,
-		},
-		{
-			.name = "try_rwlock_test_rde_wro",
-			.ftst = try_rwlock_test_rde_wro,
-		},
-	};
-
-	ret = 0;
-	for (i = 0; i != RTE_DIM(test); i++) {
-		printf("starting test %s;\n", test[i].name);
-		rc = test[i].ftst();
-		printf("test %s completed with status %d\n", test[i].name, rc);
-		ret |= rc;
-	}
-
-	return ret;
-}
-
-REGISTER_TEST_COMMAND(rwlock_autotest, test_rwlock);
-
-/* subtests used in meson for CI */
 REGISTER_TEST_COMMAND(rwlock_test1_autotest, rwlock_test1);
 REGISTER_TEST_COMMAND(rwlock_rda_autotest, try_rwlock_test_rda);
 REGISTER_TEST_COMMAND(rwlock_rds_wrm_autotest, try_rwlock_test_rds_wrm);