X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_lfs.c;h=933f0b37bfdb01c6ce8d8d618b4945569e983d61;hb=HEAD;hp=84c33f86242aed3be20f6925e33048aad39c3dc3;hpb=0614a2e61ccbf150cc51d4fd3073b285983417c5;p=urcu.git diff --git a/tests/benchmark/test_urcu_lfs.c b/tests/benchmark/test_urcu_lfs.c index 84c33f8..933f0b3 100644 --- a/tests/benchmark/test_urcu_lfs.c +++ b/tests/benchmark/test_urcu_lfs.c @@ -1,24 +1,10 @@ +// SPDX-FileCopyrightText: 2010-2012 Mathieu Desnoyers +// SPDX-FileCopyrightText: 2010 Paolo Bonzini +// +// SPDX-License-Identifier: GPL-2.0-or-later + /* - * test_urcu_lfs.c - * * Userspace RCU library - example lock-free stack - * - * Copyright 2010-2012 - 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,10 +17,10 @@ #include #include #include -#include #include #include +#include #include #include "thread-id.h" @@ -59,8 +45,6 @@ enum test_sync { static enum test_sync test_sync; -static volatile int test_go, test_stop; - static unsigned long rduration; static unsigned long duration; @@ -92,7 +76,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 */ @@ -100,7 +84,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"); @@ -124,12 +108,12 @@ static void set_affinity(void) */ static int test_duration_dequeue(void) { - return !test_stop; + return test_duration_read(); } static int test_duration_enqueue(void) { - return !test_stop; + return test_duration_write(); } static DEFINE_URCU_TLS(unsigned long long, nr_dequeues); @@ -159,10 +143,7 @@ static void *thr_enqueuer(void *_count) rcu_register_thread(); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); for (;;) { struct test *node = malloc(sizeof(*node)); @@ -261,12 +242,9 @@ static void *thr_dequeuer(void *_count) rcu_register_thread(); - 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) { @@ -301,23 +279,23 @@ static void *thr_dequeuer(void *_count) return ((void*)2); } -static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) +static void test_end(unsigned long long *nr_dequeues_l) { struct cds_lfs_node *snode; do { - snode = __cds_lfs_pop(s); + snode = __cds_lfs_pop(&s); if (snode) { struct test *node; node = caa_container_of(snode, struct test, list); free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (snode); } -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 +325,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 +353,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 +363,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]); @@ -459,7 +437,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); @@ -469,7 +447,7 @@ int main(int argc, char **argv) } } - test_stop = 1; + end_test(); for (i_thr = 0; i_thr < nr_enqueuers; i_thr++) { err = pthread_join(tid_enqueuer[i_thr], &tret); @@ -486,7 +464,7 @@ int main(int argc, char **argv) tot_successful_dequeues += count_dequeuer[2 * i_thr + 1]; } - test_end(&s, &end_dequeues); + test_end(&end_dequeues); printf_verbose("total number of enqueues : %llu, dequeues %llu\n", tot_enqueues, tot_dequeues);