From: bdemsky <bdemsky>
Date: Wed, 2 Dec 2009 04:12:20 +0000 (+0000)
Subject: small rewrites
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eed4c32917376687edc7cfb01ddd3a8eba501f93;p=IRC.git

small rewrites
---

diff --git a/Robust/src/Runtime/DSTM/interface/dsmlock.c b/Robust/src/Runtime/DSTM/interface/dsmlock.c
index 0b3135c4..ac9de02d 100644
--- a/Robust/src/Runtime/DSTM/interface/dsmlock.c
+++ b/Robust/src/Runtime/DSTM/interface/dsmlock.c
@@ -20,14 +20,14 @@ inline void writeLock(volatile unsigned int *addr) {
                         :: "a" (addr), "i" (RW_LOCK_BIAS) : "memory");
 }
 
-static inline void atomic_dec(atomic_t *v) {
+inline void atomic_dec(volatile unsigned int *v) {
   __asm__ __volatile__ (LOCK_PREFIX "decl %0"
-			: "+m" (v->counter));
+			: "+m" (v));
 }
 
-static inline void atomic_inc(atomic_t *v) {
+inline void atomic_inc(volatile unsigned int *v) {
   __asm__ __volatile__ (LOCK_PREFIX "incl %0"
-			: "+m" (v->counter));
+			: "+m" (v));
 }
 
 static inline int atomic_sub_and_test(int i, atomic_t *v) {
@@ -53,12 +53,10 @@ static inline void atomic_add(int i, atomic_t *v) {
 }
 
 inline int read_trylock(volatile unsigned int  *lock) {
-  atomic_t *count = (atomic_t *)lock;
-
-  atomic_dec(count);
-  if (atomic_read(count) >= 0)
+  atomic_dec(lock);
+  if (atomic_read(lock) >= 0)
     return 1; //can aquire a new read lock
-  atomic_inc(count);
+  atomic_inc(lock);
   return 0; //failure
 }
 
diff --git a/Robust/src/Runtime/DSTM/interface/dsmlock.h b/Robust/src/Runtime/DSTM/interface/dsmlock.h
index 2ea3cdb6..7a56b47b 100644
--- a/Robust/src/Runtime/DSTM/interface/dsmlock.h
+++ b/Robust/src/Runtime/DSTM/interface/dsmlock.h
@@ -2,7 +2,7 @@
 #define _DSMLOCK_H_
 
 #define RW_LOCK_BIAS             0x01000000
-#define atomic_read(v)          ((v)->counter)
+#define atomic_read(v)          (v)
 #define RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
 //#define LOCK_PREFIX ""
 #define LOCK_PREFIX \
@@ -23,8 +23,8 @@ void readLock(volatile unsigned int *addr);
 void writeLock(volatile unsigned int *addr);
 int read_trylock(volatile unsigned int *lock);
 int write_trylock(volatile unsigned int *lock);
-static void atomic_dec(atomic_t *v);
-static void atomic_inc(atomic_t *v);
+void atomic_dec(volatile unsigned int *v);
+void atomic_inc(volatile unsigned int *v);
 static void atomic_add(int i, atomic_t *v);
 static int atomic_sub_and_test(int i, atomic_t *v);
 void read_unlock(volatile unsigned int *rw);