libpthread-330.201.1.tar.gz

[apple/libpthread.git] / src / pthread_rwlock.c

diff --git a/src/pthread_rwlock.c b/src/pthread_rwlock.c
index 85358df6e7fb8d91376f6fcf63ce1e98411d2612..5b0bc9a70916ccf5a155683294dcbed23f0fd301 100644 (file)
--- a/src/pthread_rwlock.c
+++ b/src/pthread_rwlock.c
@@ -61,8 +61,6 @@
 #include <platform/compat.h> // for bzero
 #endif
 
 #include <platform/compat.h> // for bzero
 #endif
 

-extern int __unix_conforming;
-

 #ifdef PLOCKSTAT
 #include "plockstat.h"
 #else /* !PLOCKSTAT */
 #ifdef PLOCKSTAT
 #include "plockstat.h"
 #else /* !PLOCKSTAT */


@@ -513,7 +511,7 @@ _pthread_rwlock_updateval(_pthread_rwlock *rwlock, uint32_t updateval)
        rwlock_seq_load(seqaddr, &oldseq, RWLOCK_SEQ_LS);
        do {
                newseq = oldseq;
        rwlock_seq_load(seqaddr, &oldseq, RWLOCK_SEQ_LS);
        do {
                newseq = oldseq;

-               if (isoverlap || is_rws_setunlockinit(oldseq.rw_seq) != 0) {
+               if (isoverlap || is_rws_unlockinit_set(oldseq.rw_seq)) {

                        // Set S word to the specified value
                        uint32_t savebits = (oldseq.rw_seq & PTHRW_RWS_SAVEMASK);
                        newseq.lcntval = _pthread_rwlock_modbits(oldseq.lcntval, updateval,
                        // Set S word to the specified value
                        uint32_t savebits = (oldseq.rw_seq & PTHRW_RWS_SAVEMASK);
                        newseq.lcntval = _pthread_rwlock_modbits(oldseq.lcntval, updateval,


@@ -763,7 +761,7 @@ retry:
                                newseq.lcntval |= PTH_RWL_KBIT | PTH_RWL_WBIT;
                        }
                        newseq.lcntval += PTHRW_INC;
                                newseq.lcntval |= PTH_RWL_KBIT | PTH_RWL_WBIT;
                        }
                        newseq.lcntval += PTHRW_INC;

-                       if (is_rws_setseq(oldseq.rw_seq)) {
+                       if (is_rws_sbit_set(oldseq.rw_seq)) {

                                // Clear the S bit and set S to L
                                newseq.rw_seq &= (PTHRW_BIT_MASK & ~PTH_RWS_SBIT);
                                newseq.rw_seq |= (oldseq.lcntval & PTHRW_COUNT_MASK);
                                // Clear the S bit and set S to L
                                newseq.rw_seq &= (PTHRW_BIT_MASK & ~PTH_RWS_SBIT);
                                newseq.rw_seq |= (oldseq.lcntval & PTHRW_COUNT_MASK);