Remove AFS_PARISC_LINUX24_ENV references

[openafs.git] / src / lwp / lock.c

diff --git a/src/lwp/lock.c b/src/lwp/lock.c
index 4b9fb22..824ed17 100644 (file)
--- a/src/lwp/lock.c
+++ b/src/lwp/lock.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -25,17 +25,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
+#include <roken.h>
+#include <afs/opr.h>
 
-#ifdef AFS_PTHREAD_ENV
-#include <afs/assert.h>
-#else /* AFS_PTHREAD_ENV */
-#include <assert.h>
-#endif /* AFS_PTHRED_ENV */
 #include "lwp.h"
 #include "lock.h"
-#include <stdio.h>
 
 #define FALSE  0
 #define TRUE   1
@@ -48,25 +42,22 @@ Lock_Init(struct Lock *lock)
     lock->wait_states = 0;
     lock->num_waiting = 0;
 #ifdef AFS_PTHREAD_ENV
-    assert(pthread_mutex_init(&lock->mutex, (const pthread_mutexattr_t *)0) ==
-          0);
-    assert(pthread_cond_init(&lock->read_cv, (const pthread_condattr_t *)0) ==
-          0);
-    assert(pthread_cond_init(&lock->write_cv, (const pthread_condattr_t *)0)
-          == 0);
-#endif /* AFS_PTHRED_ENV */
+    opr_mutex_init(&lock->mutex);
+    opr_cv_init(&lock->read_cv);
+    opr_cv_init(&lock->write_cv);
+#endif /* AFS_PTHREAD_ENV */
 }
 
 void
 Lock_Destroy(struct Lock *lock)
 {
 #ifdef AFS_PTHREAD_ENV
-    assert(pthread_mutex_destroy(&lock->mutex) == 0);
-    assert(pthread_cond_destroy(&lock->read_cv) == 0);
-    assert(pthread_cond_destroy(&lock->write_cv) == 0);
-#endif /* AFS_PTHRED_ENV */
+    opr_mutex_destroy(&lock->mutex);
+    opr_cv_destroy(&lock->read_cv);
+    opr_cv_destroy(&lock->write_cv);
+#endif /* AFS_PTHREAD_ENV */
 }
-\f
+
 void
 Afs_Lock_Obtain(struct Lock *lock, int how)
 {
@@ -77,7 +68,7 @@ Afs_Lock_Obtain(struct Lock *lock, int how)
        do {
            lock->wait_states |= READ_LOCK;
 #ifdef AFS_PTHREAD_ENV
-           assert(pthread_cond_wait(&lock->read_cv, &lock->mutex) == 0);
+           opr_cv_wait(&lock->read_cv, &lock->mutex);
 #else /* AFS_PTHREAD_ENV */
            LWP_WaitProcess(&lock->readers_reading);
 #endif /* AFS_PTHREAD_ENV */
@@ -91,7 +82,7 @@ Afs_Lock_Obtain(struct Lock *lock, int how)
        do {
            lock->wait_states |= WRITE_LOCK;
 #ifdef AFS_PTHREAD_ENV
-           assert(pthread_cond_wait(&lock->write_cv, &lock->mutex) == 0);
+           opr_cv_wait(&lock->write_cv, &lock->mutex);
 #else /* AFS_PTHREAD_ENV */
            LWP_WaitProcess(&lock->excl_locked);
 #endif /* AFS_PTHREAD_ENV */
@@ -105,7 +96,7 @@ Afs_Lock_Obtain(struct Lock *lock, int how)
        do {
            lock->wait_states |= SHARED_LOCK;
 #ifdef AFS_PTHREAD_ENV
-           assert(pthread_cond_wait(&lock->write_cv, &lock->mutex) == 0);
+           opr_cv_wait(&lock->write_cv, &lock->mutex);
 #else /* AFS_PTHREAD_ENV */
            LWP_WaitProcess(&lock->excl_locked);
 #endif /* AFS_PTHREAD_ENV */
@@ -119,7 +110,7 @@ Afs_Lock_Obtain(struct Lock *lock, int how)
        do {
            lock->wait_states |= WRITE_LOCK;
 #ifdef AFS_PTHREAD_ENV
-           assert(pthread_cond_wait(&lock->write_cv, &lock->mutex) == 0);
+           opr_cv_wait(&lock->write_cv, &lock->mutex);
 #else /* AFS_PTHREAD_ENV */
            LWP_WaitProcess(&lock->excl_locked);
 #endif /* AFS_PTHREAD_ENV */
@@ -130,7 +121,7 @@ Afs_Lock_Obtain(struct Lock *lock, int how)
 
     default:
        printf("Can't happen, bad LOCK type: %d\n", how);
-       assert(0);
+       opr_Assert(0);
     }
 }
 
@@ -141,7 +132,7 @@ Afs_Lock_WakeupR(struct Lock *lock)
     if (lock->wait_states & READ_LOCK) {
        lock->wait_states &= ~READ_LOCK;
 #ifdef AFS_PTHREAD_ENV
-       assert(pthread_cond_broadcast(&lock->read_cv) == 0);
+       opr_cv_broadcast(&lock->read_cv);
 #else /* AFS_PTHREAD_ENV */
        LWP_NoYieldSignal(&lock->readers_reading);
 #endif /* AFS_PTHREAD_ENV */
@@ -155,14 +146,14 @@ Afs_Lock_ReleaseR(struct Lock *lock)
     if (lock->wait_states & READ_LOCK) {
        lock->wait_states &= ~READ_LOCK;
 #ifdef AFS_PTHREAD_ENV
-       assert(pthread_cond_broadcast(&lock->read_cv) == 0);
+       opr_cv_broadcast(&lock->read_cv);
 #else /* AFS_PTHREAD_ENV */
        LWP_NoYieldSignal(&lock->readers_reading);
 #endif /* AFS_PTHREAD_ENV */
     } else {
        lock->wait_states &= ~EXCL_LOCKS;
 #ifdef AFS_PTHREAD_ENV
-       assert(pthread_cond_broadcast(&lock->write_cv) == 0);
+       opr_cv_broadcast(&lock->write_cv);
 #else /* AFS_PTHREAD_ENV */
        LWP_NoYieldSignal(&lock->excl_locked);
 #endif /* AFS_PTHREAD_ENV */
@@ -176,14 +167,14 @@ Afs_Lock_ReleaseW(struct Lock *lock)
     if (lock->wait_states & EXCL_LOCKS) {
        lock->wait_states &= ~EXCL_LOCKS;
 #ifdef AFS_PTHREAD_ENV
-       assert(pthread_cond_broadcast(&lock->write_cv) == 0);
+       opr_cv_broadcast(&lock->write_cv);
 #else /* AFS_PTHREAD_ENV */
        LWP_NoYieldSignal(&lock->excl_locked);
 #endif /* AFS_PTHREAD_ENV */
     } else {
        lock->wait_states &= ~READ_LOCK;
 #ifdef AFS_PTHREAD_ENV
-       assert(pthread_cond_broadcast(&lock->read_cv) == 0);
+       opr_cv_broadcast(&lock->read_cv);
 #else /* AFS_PTHREAD_ENV */
        LWP_NoYieldSignal(&lock->readers_reading);
 #endif /* AFS_PTHREAD_ENV */
@@ -197,7 +188,7 @@ Afs_Lock_ReleaseW(struct Lock *lock)
 
 /* release a write lock and sleep on an address, atomically */
 void
-LWP_WaitProcessR(register void *addr, register struct Lock *alock)
+LWP_WaitProcessR(void *addr, struct Lock *alock)
 {
     ReleaseReadLock(alock);
     LWP_WaitProcess(addr);
@@ -205,7 +196,7 @@ LWP_WaitProcessR(register void *addr, register struct Lock *alock)
 
 /* release a write lock and sleep on an address, atomically */
 void
-LWP_WaitProcessW(register void *addr, register struct Lock *alock)
+LWP_WaitProcessW(void *addr, struct Lock *alock)
 {
     ReleaseWriteLock(alock);
     LWP_WaitProcess(addr);
@@ -213,7 +204,7 @@ LWP_WaitProcessW(register void *addr, register struct Lock *alock)
 
 /* release a write lock and sleep on an address, atomically */
 void
-LWP_WaitProcessS(register void *addr, register struct Lock *alock)
+LWP_WaitProcessS(void *addr, struct Lock *alock)
 {
     ReleaseSharedLock(alock);
     LWP_WaitProcess(addr);