uatomic/x86: Remove redundant memory barriers

[urcu.git] / tests / benchmark / test_perthreadlock_timing.c

diff --git a/tests/benchmark/test_perthreadlock_timing.c b/tests/benchmark/test_perthreadlock_timing.c
index 97bdd044eae4d231621456efbd4b010b3d72c1aa..78222750302dd6e46a4d5fd1a60dbe36fd05f2c6 100644 (file)
--- a/tests/benchmark/test_perthreadlock_timing.c
+++ b/tests/benchmark/test_perthreadlock_timing.c
@@ -1,23 +1,9 @@
+// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
- * test_perthreadloc_timing.c
- *
  * Per thread locks - test program
- *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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 <stdio.h>
@@ -28,11 +14,11 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <assert.h>
 #include <pthread.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/assert.h>
 
 #include "thread-id.h"
 
@@ -64,14 +50,16 @@ static int num_write;
 #define NR_READ num_read
 #define NR_WRITE num_write
 
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
+static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
+static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
-       int i, j;
-       cycles_t time1, time2;
+       caa_cycles_t time1, time2;
        long tidx = (long)arg;
+       unsigned int i, j;
+       int ret;
 
        printf("thread_begin %s, tid %lu\n",
                "reader", urcu_get_thread_id());
@@ -80,9 +68,17 @@ void *thr_reader(void *arg)
        time1 = caa_get_cycles();
        for (i = 0; i < OUTER_READ_LOOP; i++) {
                for (j = 0; j < INNER_READ_LOOP; j++) {
-                       pthread_mutex_lock(&per_thread_lock[tidx].lock);
-                       assert(test_array.a == 8);
-                       pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+                       ret = pthread_mutex_lock(&per_thread_lock[tidx].lock);
+                       if (ret) {
+                               perror("Error in pthread mutex lock");
+                               exit(-1);
+                       }
+                       urcu_posix_assert(test_array.a == 8);
+                       ret = pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+                       if (ret) {
+                               perror("Error in pthread mutex unlock");
+                               exit(-1);
+                       }
                }
        }
        time2 = caa_get_cycles();
@@ -96,11 +92,13 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
-       int i, j;
+       caa_cycles_t time1, time2;
+       unsigned int i, j;
        long tidx;
-       cycles_t time1, time2;
+       int ret;
 
        printf("thread_begin %s, tid %lu\n",
                "writer", urcu_get_thread_id());
@@ -110,11 +108,19 @@ void *thr_writer(void *arg)
                for (j = 0; j < INNER_WRITE_LOOP; j++) {
                        time1 = caa_get_cycles();
                        for (tidx = 0; tidx < NR_READ; tidx++) {
-                               pthread_mutex_lock(&per_thread_lock[tidx].lock);
+                               ret = pthread_mutex_lock(&per_thread_lock[tidx].lock);
+                               if (ret) {
+                                       perror("Error in pthread mutex lock");
+                                       exit(-1);
+                               }
                        }
                        test_array.a = 8;
                        for (tidx = NR_READ - 1; tidx >= 0; tidx--) {
-                               pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+                               ret = pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+                               if (ret) {
+                                       perror("Error in pthread mutex unlock");
+                                       exit(-1);
+                               }
                        }
                        time2 = caa_get_cycles();
                        writer_time[(unsigned long)arg] += time2 - time1;
@@ -133,8 +139,8 @@ int main(int argc, char **argv)
        pthread_t *tid_reader, *tid_writer;
        void *tret;
        int i;
-       cycles_t tot_rtime = 0;
-       cycles_t tot_wtime = 0;
+       caa_cycles_t tot_rtime = 0;
+       caa_cycles_t tot_wtime = 0;
 
        if (argc < 2) {
                printf("Usage : %s nr_readers nr_writers\n", argv[0]);