test: insanesync: consolidate lines

[cdsspec-compiler.git] / test / linuxrwlocks.c

diff --git a/test/linuxrwlocks.c b/test/linuxrwlocks.c
index 3862ed491474ec452b5fba5cdc410ee9a02c5176..7e317aa9fcf019b91336823985d5054c9b23166d 100644 (file)
--- a/test/linuxrwlocks.c
+++ b/test/linuxrwlocks.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
+#include <threads.h>
+#include <stdatomic.h>
 
-#include "libthreads.h"
 #include "librace.h"
-#include "stdatomic.h"
 
 #define RW_LOCK_BIAS            0x00100000
 #define WRITE_LOCK_CMP          RW_LOCK_BIAS
@@ -26,32 +26,32 @@ static inline int write_can_lock(rwlock_t *lock)
 
 static inline void read_lock(rwlock_t *rw)
 {
-       int priorvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
-       while (priorvalue<=0) {
+       int priorvalue = atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
+       while (priorvalue <= 0) {
                atomic_fetch_add_explicit(&rw->lock, 1, memory_order_relaxed);
                do {
-                       priorvalue=atomic_load_explicit(&rw->lock, memory_order_relaxed);
-               }       while(priorvalue<=0);
-               priorvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
+                       priorvalue = atomic_load_explicit(&rw->lock, memory_order_relaxed);
+               } while (priorvalue <= 0);
+               priorvalue = atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
        }
 }
 
 static inline void write_lock(rwlock_t *rw)
 {
-       int priorvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
-       while (priorvalue!=RW_LOCK_BIAS) {
+       int priorvalue = atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
+       while (priorvalue != RW_LOCK_BIAS) {
                atomic_fetch_add_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_relaxed);
                do {
-                       priorvalue=atomic_load_explicit(&rw->lock, memory_order_relaxed);
-               }       while(priorvalue!=RW_LOCK_BIAS);
-               priorvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
+                       priorvalue = atomic_load_explicit(&rw->lock, memory_order_relaxed);
+               } while (priorvalue != RW_LOCK_BIAS);
+               priorvalue = atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
        }
 }
 
 static inline int read_trylock(rwlock_t *rw)
 {
-       int priorvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
-       if (priorvalue>0)
+       int priorvalue = atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
+       if (priorvalue > 0)
                return 1;
 
        atomic_fetch_add_explicit(&rw->lock, 1, memory_order_relaxed);
@@ -60,8 +60,8 @@ static inline int read_trylock(rwlock_t *rw)
 
 static inline int write_trylock(rwlock_t *rw)
 {
-       int priorvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
-       if (priorvalue==RW_LOCK_BIAS)
+       int priorvalue = atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
+       if (priorvalue == RW_LOCK_BIAS)
                return 1;
 
        atomic_fetch_add_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_relaxed);
@@ -84,8 +84,8 @@ int shareddata;
 static void a(void *obj)
 {
        int i;
-       for(i=0;i<2;i++) {
-               if ((i%2)==0) {
+       for(i = 0; i < 2; i++) {
+               if ((i % 2) == 0) {
                        read_lock(&mylock);
                        load_32(&shareddata);
                        read_unlock(&mylock);
@@ -97,7 +97,7 @@ static void a(void *obj)
        }
 }
 
-void user_main()
+int user_main(int argc, char **argv)
 {
        thrd_t t1, t2;
        atomic_init(&mylock.lock, RW_LOCK_BIAS);
@@ -107,4 +107,6 @@ void user_main()
 
        thrd_join(t1);
        thrd_join(t2);
+
+       return 0;
 }