Cleanup: enable signed/unsigned compare compiler warning

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

diff --git a/tests/benchmark/test_rwlock.c b/tests/benchmark/test_rwlock.c
index 3fad9cf273bb6300143d2b6e147667aa1752accc..4628080e3ba30846ad65a11fcbbec6c0329dfca4 100644 (file)
--- a/tests/benchmark/test_rwlock.c
+++ b/tests/benchmark/test_rwlock.c
@@ -20,8 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -50,7 +48,11 @@ struct test_array {
        int a;
 };
 
-pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
+/*
+ * static rwlock initializer is broken on Cygwin. Use runtime
+ * initialization.
+ */
+pthread_rwlock_t lock;
 
 static volatile int test_go, test_stop;
 
@@ -175,22 +177,34 @@ void *thr_reader(void *_count)
        }
 
        for (;;) {
-               int a;
+               int a, ret;
+
+               ret = pthread_rwlock_rdlock(&lock);
+               if (ret) {
+                       fprintf(stderr, "reader pthread_rwlock_rdlock: %s\n", strerror(ret));
+                       abort();
+               }
 
-               pthread_rwlock_rdlock(&lock);
                a = test_array.a;
                assert(a == 8);
                if (caa_unlikely(rduration))
                        loop_sleep(rduration);
-               pthread_rwlock_unlock(&lock);
+
+               ret = pthread_rwlock_unlock(&lock);
+               if (ret) {
+                       fprintf(stderr, "reader pthread_rwlock_unlock: %s\n", strerror(ret));
+                       abort();
+               }
+
                URCU_TLS(nr_reads)++;
                if (caa_unlikely(!test_duration_read()))
                        break;
        }
 
        *count = URCU_TLS(nr_reads);
-       printf_verbose("thread_end %s, tid %lu\n",
-                       "reader", urcu_get_thread_id());
+
+       printf_verbose("thread_end %s, tid %lu, count %llu\n",
+                       "reader", urcu_get_thread_id(), *count);
        return ((void*)1);
 
 }
@@ -210,22 +224,35 @@ void *thr_writer(void *_count)
        cmm_smp_mb();
 
        for (;;) {
-               pthread_rwlock_wrlock(&lock);
+               int ret;
+
+               ret = pthread_rwlock_wrlock(&lock);
+               if (ret) {
+                       fprintf(stderr, "writer pthread_rwlock_wrlock: %s\n", strerror(ret));
+                       abort();
+               }
+
                test_array.a = 0;
                test_array.a = 8;
                if (caa_unlikely(wduration))
                        loop_sleep(wduration);
-               pthread_rwlock_unlock(&lock);
+
+               ret = pthread_rwlock_unlock(&lock);
+               if (ret) {
+                       fprintf(stderr, "writer pthread_rwlock_unlock: %s\n", strerror(ret));
+                       abort();
+               }
+
                URCU_TLS(nr_writes)++;
                if (caa_unlikely(!test_duration_write()))
                        break;
                if (caa_unlikely(wdelay))
                        loop_sleep(wdelay);
        }
-
-       printf_verbose("thread_end %s, tid %lu\n",
-                       "writer", urcu_get_thread_id());
        *count = URCU_TLS(nr_writes);
+
+       printf_verbose("thread_end %s, tid %lu, count %llu\n",
+                       "writer", urcu_get_thread_id(), *count);
        return ((void*)2);
 }
 
@@ -250,6 +277,7 @@ int main(int argc, char **argv)
        unsigned long long *count_reader, *count_writer;
        unsigned long long tot_reads = 0, tot_writes = 0;
        int i, a;
+       unsigned int i_thr;
 
        if (argc < 4) {
                show_usage(argc, argv);
@@ -319,10 +347,17 @@ int main(int argc, char **argv)
        printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
                duration, nr_readers, nr_writers);
        printf_verbose("Writer delay : %lu loops.\n", wdelay);
+       printf_verbose("Writer duration : %lu loops.\n", wduration);
        printf_verbose("Reader duration : %lu loops.\n", rduration);
        printf_verbose("thread %-6s, tid %lu\n",
                        "main", urcu_get_thread_id());
 
+       err = pthread_rwlock_init(&lock, NULL);
+       if (err != 0) {
+               fprintf(stderr, "pthread_rwlock_init: (%d) %s\n", err, strerror(err));
+               exit(1);
+       }
+
        tid_reader = calloc(nr_readers, sizeof(*tid_reader));
        tid_writer = calloc(nr_writers, sizeof(*tid_writer));
        count_reader = calloc(nr_readers, sizeof(*count_reader));
@@ -330,15 +365,15 @@ int main(int argc, char **argv)
 
        next_aff = 0;
 
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_create(&tid_reader[i], NULL, thr_reader,
-                                    &count_reader[i]);
+       for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+               err = pthread_create(&tid_reader[i_thr], NULL, thr_reader,
+                                    &count_reader[i_thr]);
                if (err != 0)
                        exit(1);
        }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_create(&tid_writer[i], NULL, thr_writer,
-                                    &count_writer[i]);
+       for (i_thr = 0; i_thr < nr_writers; i_thr++) {
+               err = pthread_create(&tid_writer[i_thr], NULL, thr_writer,
+                                    &count_writer[i_thr]);
                if (err != 0)
                        exit(1);
        }
@@ -351,17 +386,17 @@ int main(int argc, char **argv)
 
        test_stop = 1;
 
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_join(tid_reader[i], &tret);
+       for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+               err = pthread_join(tid_reader[i_thr], &tret);
                if (err != 0)
                        exit(1);
-               tot_reads += count_reader[i];
+               tot_reads += count_reader[i_thr];
        }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_join(tid_writer[i], &tret);
+       for (i_thr = 0; i_thr < nr_writers; i_thr++) {
+               err = pthread_join(tid_writer[i_thr], &tret);
                if (err != 0)
                        exit(1);
-               tot_writes += count_writer[i];
+               tot_writes += count_writer[i_thr];
        }
 
        printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
@@ -373,6 +408,11 @@ int main(int argc, char **argv)
                nr_writers, wdelay, tot_reads, tot_writes,
                tot_reads + tot_writes);
 
+       err = pthread_rwlock_destroy(&lock);
+       if (err != 0) {
+               fprintf(stderr, "pthread_rwlock_destroy: (%d) %s\n", err, strerror(err));
+               exit(1);
+       }
        free(tid_reader);
        free(tid_writer);
        free(count_reader);