projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7da7d6e
)
test: linuxrwlocks: fixup spacing
author
Brian Norris
<banorris@uci.edu>
Mon, 8 Oct 2012 17:31:41 +0000
(10:31 -0700)
committer
Brian Norris
<banorris@uci.edu>
Mon, 8 Oct 2012 18:11:40 +0000
(11:11 -0700)
test/linuxrwlocks.c
patch
|
blob
|
history
diff --git
a/test/linuxrwlocks.c
b/test/linuxrwlocks.c
index 3862ed491474ec452b5fba5cdc410ee9a02c5176..896ae30b2dd54cd97f4e18fda4de60face50e018 100644
(file)
--- a/
test/linuxrwlocks.c
+++ b/
test/linuxrwlocks.c
@@
-26,32
+26,32
@@
static inline int write_can_lock(rwlock_t *lock)
static inline void read_lock(rwlock_t *rw)
{
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 {
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)
{
}
}
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 {
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)
{
}
}
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);
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)
{
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);
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;
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);
read_lock(&mylock);
load_32(&shareddata);
read_unlock(&mylock);