X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_perthreadlock.c;h=47a512cba06b12d8672247710db5feabdd2e3c45;hp=512b1fc8ff1dc1f6697c28911ce382cec3c1ebe3;hb=HEAD;hpb=83e334d03eaba62df373cf44298616458900078a diff --git a/tests/benchmark/test_perthreadlock.c b/tests/benchmark/test_perthreadlock.c index 512b1fc..2cc50d1 100644 --- a/tests/benchmark/test_perthreadlock.c +++ b/tests/benchmark/test_perthreadlock.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" /* hardcoded number of CPUs */ @@ -54,8 +39,6 @@ struct per_thread_lock { static struct per_thread_lock *per_thread_lock; -static volatile int test_go, test_stop; - static unsigned long wdelay; static volatile struct test_array test_array = { 8 }; @@ -90,7 +73,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 */ @@ -98,7 +81,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) { errno = ret; @@ -114,27 +97,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); @@ -170,6 +136,7 @@ static void urcu_mutex_unlock(pthread_mutex_t *lock) } } +static void *thr_reader(void *data) { unsigned long tidx = (unsigned long)data; @@ -179,16 +146,14 @@ void *thr_reader(void *data) set_affinity(); - while (!test_go) - { - } + wait_until_go(); for (;;) { int v; urcu_mutex_lock(&per_thread_lock[tidx].lock); v = test_array.a; - assert(v == 8); + urcu_posix_assert(v == 8); if (caa_unlikely(rduration)) loop_sleep(rduration); urcu_mutex_unlock(&per_thread_lock[tidx].lock); @@ -204,6 +169,7 @@ void *thr_reader(void *data) } +static void *thr_writer(void *data) { unsigned long wtidx = (unsigned long)data; @@ -214,13 +180,10 @@ void *thr_writer(void *data) set_affinity(); - while (!test_go) - { - } - cmm_smp_mb(); + wait_until_go(); for (;;) { - for (tidx = 0; tidx < nr_readers; tidx++) { + for (tidx = 0; tidx < (long)nr_readers; tidx++) { urcu_mutex_lock(&per_thread_lock[tidx].lock); } test_array.a = 0; @@ -243,7 +206,8 @@ void *thr_writer(void *data) 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]); @@ -266,26 +230,26 @@ int main(int argc, char **argv) unsigned int i_thr; if (argc < 4) { - show_usage(argc, argv); + show_usage(argv); return -1; } cmm_smp_mb(); 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; } @@ -295,7 +259,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]); @@ -305,21 +269,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]); @@ -361,13 +325,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);