#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>
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,
static struct {
rte_rwlock_t lock;
uint64_t tick;
+
volatile union {
uint8_t u8[RTE_CACHE_LINE_SIZE];
uint64_t u64[RTE_CACHE_LINE_SIZE / sizeof(uint64_t)];
/* 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) {
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();
int i;
rte_rwlock_init(&sl);
- for (i=0; i<RTE_MAX_LCORE; i++)
+ for (i = 0; i < RTE_MAX_LCORE; i++)
rte_rwlock_init(&sl_tab[i]);
rte_rwlock_write_lock(&sl);
if (rc != 0)
return rc;
- /* update by bytes in reverese order */
+ /* update by bytes in reverse order */
for (i = RTE_DIM(try_rwlock_data.data.u8); i-- != 0; ) {
/* race condition occurred, lock doesn't work properly */
try_rwlock_data.data.u8[i] = v;
}
- /* restore by bytes in reverese order */
+ /* restore by bytes in reverse order */
for (i = RTE_DIM(try_rwlock_data.data.u8); i-- != 0; ) {
/* race condition occurred, lock doesn't work properly */
{
try_test_reset();
- /* start read test on all avaialble lcores */
+ /* start read test on all available lcores */
rte_eal_mp_remote_launch(try_read_lcore, NULL, CALL_MAIN);
rte_eal_mp_wait_lcore();
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);