Cleanup: enable signed/unsigned compare compiler warning

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

diff --git a/tests/benchmark/test_mutex.c b/tests/benchmark/test_mutex.c
index 574d0e8cfce8efb3363c32c8acdae103113b27df..19eb7c4f929b8cb84d5cea95040f4669a7bcd81f 100644 (file)
--- a/tests/benchmark/test_mutex.c
+++ b/tests/benchmark/test_mutex.c
@@ -20,8 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
  * 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>
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>


@@ -179,8 +177,11 @@ void *thr_reader(void *data)
        }
 
        for (;;) {
        }
 
        for (;;) {

+               int v;
+

                pthread_mutex_lock(&lock);
                pthread_mutex_lock(&lock);

-               assert(test_array.a == 8);
+               v = test_array.a;
+               assert(v == 8);

                if (caa_unlikely(rduration))
                        loop_sleep(rduration);
                pthread_mutex_unlock(&lock);
                if (caa_unlikely(rduration))
                        loop_sleep(rduration);
                pthread_mutex_unlock(&lock);


@@ -251,6 +252,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 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);
 
        if (argc < 4) {
                show_usage(argc, argv);


@@ -269,7 +271,7 @@ int main(int argc, char **argv)
                show_usage(argc, argv);
                return -1;
        }
                show_usage(argc, argv);
                return -1;
        }

-       
+

        err = sscanf(argv[3], "%lu", &duration);
        if (err != 1) {
                show_usage(argc, argv);
        err = sscanf(argv[3], "%lu", &duration);
        if (err != 1) {
                show_usage(argc, argv);


@@ -333,15 +335,15 @@ int main(int argc, char **argv)
 
        next_aff = 0;
 
 
        next_aff = 0;
 

-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_create(&tid_reader[i], NULL, thr_reader,
-                                    (void *)(long)i);
+       for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+               err = pthread_create(&tid_reader[i_thr], NULL, thr_reader,
+                                    (void *)(long)i_thr);

                if (err != 0)
                        exit(1);
        }
                if (err != 0)
                        exit(1);
        }

-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_create(&tid_writer[i], NULL, thr_writer,
-                                    (void *)(long)i);
+       for (i_thr = 0; i_thr < nr_writers; i_thr++) {
+               err = pthread_create(&tid_writer[i_thr], NULL, thr_writer,
+                                    (void *)(long)i_thr);

                if (err != 0)
                        exit(1);
        }
                if (err != 0)
                        exit(1);
        }


@@ -354,17 +356,17 @@ int main(int argc, char **argv)
 
        test_stop = 1;
 
 
        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);
                if (err != 0)
                        exit(1);

-               tot_reads += tot_nr_reads[i];
+               tot_reads += tot_nr_reads[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);
                if (err != 0)
                        exit(1);

-               tot_writes += tot_nr_writes[i];
+               tot_writes += tot_nr_writes[i_thr];

        }
 
        printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
        }
 
        printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,