Skip to content

Commit

Permalink
Revert "Memory ordering in pthread_mutex_{,timed}lock."
Browse files Browse the repository at this point in the history
This reverts commit 7b7f43b.
  • Loading branch information
Ulrich Drepper committed Jul 27, 2009
1 parent e83c1a8 commit 052757b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 19 deletions.
7 changes: 0 additions & 7 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
2009-07-26 Ulrich Drepper <drepper@redhat.com>

[BZ #10418]
* pthread_mutex_lock.c (pthread_mutex_lock): Use _rel instead of of
_acq variants of cmpxchg.
* pthread_mutex_timedlock.c (pthread_mutex_timedlock): Likewise.

2009-07-23 Ulrich Drepper <drepper@redhat.com>

* sysdeps/x86_64/configure.in: New file.
Expand Down
12 changes: 6 additions & 6 deletions nptl/pthread_mutex_lock.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc.
/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -160,7 +160,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
#endif

newval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
newval, oldval);

if (newval != oldval)
Expand Down Expand Up @@ -285,7 +285,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
#ifdef NO_INCR
newval |= FUTEX_WAITERS;
#endif
oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
newval, 0);

if (oldval != 0)
Expand Down Expand Up @@ -420,7 +420,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
oldprio = ceiling;

oldval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
#ifdef NO_INCR
ceilval | 2,
#else
Expand All @@ -434,7 +434,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
do
{
oldval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 2,
ceilval | 1);

Expand All @@ -445,7 +445,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
lll_futex_wait (&mutex->__data.__lock, ceilval | 2,
PTHREAD_MUTEX_PSHARED (mutex));
}
while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 2, ceilval)
!= ceilval);
}
Expand Down
12 changes: 6 additions & 6 deletions nptl/pthread_mutex_timedlock.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc.
/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -126,7 +126,7 @@ pthread_mutex_timedlock (mutex, abstime)
int newval = id | (oldval & FUTEX_WAITERS);

newval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
newval, oldval);
if (newval != oldval)
{
Expand Down Expand Up @@ -246,7 +246,7 @@ pthread_mutex_timedlock (mutex, abstime)
}
}

oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
id, 0);

if (oldval != 0)
Expand Down Expand Up @@ -404,7 +404,7 @@ pthread_mutex_timedlock (mutex, abstime)
oldprio = ceiling;

oldval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 1, ceilval);

if (oldval == ceilval)
Expand All @@ -413,7 +413,7 @@ pthread_mutex_timedlock (mutex, abstime)
do
{
oldval
= atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 2,
ceilval | 1);

Expand Down Expand Up @@ -456,7 +456,7 @@ pthread_mutex_timedlock (mutex, abstime)
PTHREAD_MUTEX_PSHARED (mutex));
}
}
while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock,
while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 2, ceilval)
!= ceilval);
}
Expand Down

0 comments on commit 052757b

Please sign in to comment.