X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flinuxrwlocks.c;h=7e317aa9fcf019b91336823985d5054c9b23166d;hb=f9e2e3a893918a431d3af1e6657cd08260e31941;hp=18e6ffbbcc169dfdfca8bb11b718b61d02340f4b;hpb=5fe0eea8bf392753f69ed8193a592b299a137e9c;p=cdsspec-compiler.git

diff --git a/test/linuxrwlocks.c b/test/linuxrwlocks.c
index 18e6ffb..7e317aa 100644
--- a/test/linuxrwlocks.c
+++ b/test/linuxrwlocks.c
@@ -1,9 +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
@@ -11,7 +10,6 @@
 /** Example implementation of linux rw lock along with 2 thread test
  *  driver... */
 
-
 typedef union {
 	atomic_int lock;
 } rwlock_t;
@@ -28,44 +26,44 @@ static inline int write_can_lock(rwlock_t *lock)
 
 static inline void read_lock(rwlock_t *rw)
 {
-	int currentvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
-	while (currentvalue<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 {
-			currentvalue=atomic_load_explicit(&rw->lock, memory_order_relaxed);
-		}	while(currentvalue<=0);
-		currentvalue=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 currentvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
-	while (currentvalue!=0) {
+	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 {
-			currentvalue=atomic_load_explicit(&rw->lock, memory_order_relaxed);
-		}	while(currentvalue!=RW_LOCK_BIAS);
-		currentvalue=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 currentvalue=atomic_fetch_sub_explicit(&rw->lock, 1, memory_order_acquire);
-	if (currentvalue>=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);
 	return 0;
 }
 
 static inline int write_trylock(rwlock_t *rw)
 {
-	int currentvalue=atomic_fetch_sub_explicit(&rw->lock, RW_LOCK_BIAS, memory_order_acquire);
-	if (currentvalue>=0)
+	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);
 	return 0;
 }
@@ -86,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);
@@ -99,16 +97,16 @@ 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);
 
-	printf("Thread %d: creating 2 threads\n", thrd_current());
 	thrd_create(&t1, (thrd_start_t)&a, NULL);
 	thrd_create(&t2, (thrd_start_t)&a, NULL);
-	
+
 	thrd_join(t1);
 	thrd_join(t2);
-	printf("Thread %d is finished\n", thrd_current());
+
+	return 0;
 }