X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_bp.c;h=6f8c59d67500d548a8ffec10f0272ff5a1ed8f51;hp=86b0b022245aadd18d7c306f08ff7ee460e58c95;hb=HEAD;hpb=83e334d03eaba62df373cf44298616458900078a diff --git a/tests/benchmark/test_urcu_bp.c b/tests/benchmark/test_urcu_bp.c index 86b0b02..5da7132 100644 --- a/tests/benchmark/test_urcu_bp.c +++ b/tests/benchmark/test_urcu_bp.c @@ -1,23 +1,9 @@ +// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers +// +// SPDX-License-Identifier: GPL-2.0-or-later + /* - * test_urcu.c - * * Userspace RCU library - test program - * - * Copyright February 2009 - Mathieu Desnoyers - * - * 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 @@ -28,12 +14,11 @@ #include #include #include -#include #include #include +#include #include -#include "cpuset.h" #include "thread-id.h" #include "../common/debug-yield.h" @@ -45,8 +30,6 @@ #endif #include -static volatile int test_go, test_stop; - static unsigned long wdelay; static int *test_rcu_pointer; @@ -81,7 +64,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 */ @@ -89,7 +72,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"); @@ -104,27 +87,10 @@ 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 */ } -/* - * returns 0 if test should end. - */ -static int test_duration_write(void) -{ - return !test_stop; -} - -static int test_duration_read(void) -{ - return !test_stop; -} - static DEFINE_URCU_TLS(unsigned long long, nr_writes); static DEFINE_URCU_TLS(unsigned long long, nr_reads); @@ -133,27 +99,7 @@ static unsigned int nr_writers; pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER; -void rcu_copy_mutex_lock(void) -{ - int ret; - ret = pthread_mutex_lock(&rcu_copy_mutex); - if (ret) { - perror("Error in pthread mutex lock"); - exit(-1); - } -} - -void rcu_copy_mutex_unlock(void) -{ - int ret; - - ret = pthread_mutex_unlock(&rcu_copy_mutex); - if (ret) { - perror("Error in pthread mutex unlock"); - exit(-1); - } -} - +static void *thr_reader(void *_count) { unsigned long long *count = _count; @@ -165,20 +111,17 @@ void *thr_reader(void *_count) set_affinity(); rcu_register_thread(); - assert(!rcu_read_ongoing()); + urcu_posix_assert(!rcu_read_ongoing()); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); for (;;) { rcu_read_lock(); - assert(rcu_read_ongoing()); + urcu_posix_assert(rcu_read_ongoing()); local_ptr = rcu_dereference(test_rcu_pointer); rcu_debug_yield_read(); if (local_ptr) - assert(*local_ptr == 8); + urcu_posix_assert(*local_ptr == 8); if (caa_unlikely(rduration)) loop_sleep(rduration); rcu_read_unlock(); @@ -196,6 +139,7 @@ void *thr_reader(void *_count) } +static void *thr_writer(void *_count) { unsigned long long *count = _count; @@ -206,10 +150,7 @@ void *thr_writer(void *_count) set_affinity(); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); for (;;) { new = malloc(sizeof(int)); @@ -234,7 +175,8 @@ void *thr_writer(void *_count) return ((void*)2); } -void show_usage(int argc, char **argv) +static +void show_usage(char **argv) { printf("Usage : %s nr_readers nr_writers duration (s) \n", argv[0]); @@ -259,25 +201,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_readers); if (err != 1) { - show_usage(argc, argv); + show_usage(argv); return -1; } err = sscanf(argv[2], "%u", &nr_writers); 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; } @@ -293,7 +235,7 @@ int main(int argc, char **argv) break; case 'a': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); return -1; } a = atoi(argv[++i]); @@ -303,21 +245,21 @@ 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]); break; case 'e': if (argc < i + 2) { - show_usage(argc, argv); + show_usage(argv); return -1; } wduration = atol(argv[++i]); @@ -355,13 +297,7 @@ int main(int argc, char **argv) exit(1); } - cmm_smp_mb(); - - test_go = 1; - - sleep(duration); - - test_stop = 1; + test_for(duration); for (i_thr = 0; i_thr < nr_readers; i_thr++) { err = pthread_join(tid_reader[i_thr], &tret);