X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_wfs.c;h=39704f4acb5cce5eee13112fa127d78bea31e6d7;hp=2c82c019577a5454fef2047c1c570b5813d26465;hb=HEAD;hpb=83e334d03eaba62df373cf44298616458900078a diff --git a/tests/benchmark/test_urcu_wfs.c b/tests/benchmark/test_urcu_wfs.c index 2c82c01..39704f4 100644 --- a/tests/benchmark/test_urcu_wfs.c +++ b/tests/benchmark/test_urcu_wfs.c @@ -1,24 +1,10 @@ -/* - * test_urcu_wfs.c - * +// SPDX-FileCopyrightText: 2010 Mathieu Desnoyers +// SPDX-FileCopyrightText: 2010 Paolo Bonzini +// +// SPDX-License-Identifier: GPL-2.0-or-later + + /* * Userspace RCU library - example RCU-based lock-free stack - * - * Copyright February 2010 - Mathieu Desnoyers - * Copyright February 2010 - Paolo Bonzini - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -31,13 +17,12 @@ #include #include #include -#include #include #include +#include #include #include -#include "cpuset.h" #include "thread-id.h" /* hardcoded number of CPUs */ @@ -60,7 +45,7 @@ static enum test_sync test_sync; static int test_force_sync; -static volatile int test_go, test_stop_enqueue, test_stop_dequeue; +static volatile int test_stop_enqueue, test_stop_dequeue; static unsigned long rduration; @@ -94,7 +79,7 @@ pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER; static void set_affinity(void) { -#if HAVE_SCHED_SETAFFINITY +#ifdef HAVE_SCHED_SETAFFINITY cpu_set_t mask; int cpu, ret; #endif /* HAVE_SCHED_SETAFFINITY */ @@ -102,7 +87,7 @@ static void set_affinity(void) if (!use_affinity) return; -#if HAVE_SCHED_SETAFFINITY +#ifdef HAVE_SCHED_SETAFFINITY ret = pthread_mutex_lock(&affinity_mutex); if (ret) { perror("Error in pthread mutex lock"); @@ -117,11 +102,7 @@ static void set_affinity(void) CPU_ZERO(&mask); CPU_SET(cpu, &mask); -#if SCHED_SETAFFINITY_ARGS == 2 - sched_setaffinity(0, &mask); -#else sched_setaffinity(0, sizeof(mask), &mask); -#endif #endif /* HAVE_SCHED_SETAFFINITY */ } @@ -130,12 +111,12 @@ static void set_affinity(void) */ static int test_duration_dequeue(void) { - return !test_stop_dequeue; + return !uatomic_load(&test_stop_dequeue, CMM_RELAXED); } static int test_duration_enqueue(void) { - return !test_stop_enqueue; + return !uatomic_load(&test_stop_enqueue, CMM_RELAXED); } static DEFINE_URCU_TLS(unsigned long long, nr_dequeues); @@ -162,10 +143,7 @@ static void *thr_enqueuer(void *_count) set_affinity(); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); for (;;) { struct cds_wfs_node *node = malloc(sizeof(*node)); @@ -255,12 +233,9 @@ static void *thr_dequeuer(void *_count) set_affinity(); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); - assert(test_pop || test_pop_all); + urcu_posix_assert(test_pop || test_pop_all); for (;;) { if (test_pop && test_pop_all) { @@ -296,24 +271,24 @@ static void *thr_dequeuer(void *_count) return ((void*)2); } -static void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues, - unsigned long long *nr_pop_last) +static void test_end(unsigned long long *nr_dequeues_l, + unsigned long long *nr_pop_last_l) { struct cds_wfs_node *node; int state; do { - node = cds_wfs_pop_with_state_blocking(s, &state); + node = cds_wfs_pop_with_state_blocking(&s, &state); if (node) { if (state & CDS_WFS_STATE_LAST) - (*nr_pop_last)++; + (*nr_pop_last_l)++; free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (node); } -static void show_usage(int argc, char **argv) +static void show_usage(char **argv) { printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) \n", argv[0]); @@ -347,25 +322,25 @@ int main(int argc, char **argv) unsigned int i_thr; if (argc < 4) { - show_usage(argc, argv); + show_usage(argv); return -1; } err = sscanf(argv[1], "%u", &nr_dequeuers); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); return -1; } err = sscanf(argv[2], "%u", &nr_enqueuers); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); return -1; } err = sscanf(argv[3], "%lu", &duration); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); return -1; } @@ -375,7 +350,7 @@ int main(int argc, char **argv) switch (argv[i][1]) { case 'a': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); return -1; } a = atoi(argv[++i]); @@ -385,14 +360,14 @@ int main(int argc, char **argv) break; case 'c': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); return -1; } rduration = atol(argv[++i]); break; case 'd': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); return -1; } wdelay = atol(argv[++i]); @@ -474,7 +449,7 @@ int main(int argc, char **argv) cmm_smp_mb(); - test_go = 1; + begin_test(); for (i_thr = 0; i_thr < duration; i_thr++) { sleep(1); @@ -484,7 +459,7 @@ int main(int argc, char **argv) } } - test_stop_enqueue = 1; + uatomic_store(&test_stop_enqueue, 1, CMM_RELEASE); if (test_wait_empty) { while (nr_enqueuers != uatomic_read(&test_enqueue_stopped)) { @@ -495,7 +470,7 @@ int main(int argc, char **argv) } } - test_stop_dequeue = 1; + uatomic_store(&test_stop_dequeue, 1, CMM_RELAXED); for (i_thr = 0; i_thr < nr_enqueuers; i_thr++) { err = pthread_join(tid_enqueuer[i_thr], &tret); @@ -515,7 +490,7 @@ int main(int argc, char **argv) tot_pop_last += count_dequeuer[4 * i_thr + 3]; } - test_end(&s, &end_dequeues, &tot_pop_last); + test_end(&end_dequeues, &tot_pop_last); printf_verbose("total number of enqueues : %llu, dequeues %llu\n", tot_enqueues, tot_dequeues);