Fix mutex assertion

RX mutexes have two mechanisms for asserting ownership of a mutex:
MUTEX_ISMINE, which returns true if the caller is the owner of the
mutex in question, and osirx_AssertMutex which fires an assertion if
the calling thread doesn't own a specified mutex.

Neither of these work with pthread mutexes on all platforms, and the
kernel support for MUTEX_ISMINE is dubious in places. Because in some
implementations, MUTEX_ISMINE tries to lock the mutex in question, a
failing call to MUTEX_ISMINE can lead to the process holding an
additional, unexpected, lock.

This patch reworks all of this, and uses the new opr mutex framework
so that we can do mutex assertions in userspace, too. We remove the
unsafe MUTEX_ISMINE macro, and replace it with MUTEX_ASSERT which
simply asserts if the specified mutex is not held by the current
thread. osirx_AssertMutex is removed as it is now redundant.
MUTEX_ASSERT will always work in kernel code.

For userspace, we provide opr_mutex_assert, which is implemented using
POSIX error checking mutexes. As error checking mutexes have a runtime
overhead, this is only available when configured with
--enable-debug-locks, the rest of the time calls to opr_mutex_assert are
no-ops.

Change-Id: I285ee2b558389fa3d63b786e4bc4420fa2126c80
Reviewed-on: http://gerrit.openafs.org/8282
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/acinclude.m4 b/acinclude.m4
index 05a933fd304c494f3caaef6c5bb65d3783f3ecdc..a3362f0b0374ce9eddf135f7e4a8e9004a7c44e3 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -192,6 +192,11 @@ AC_ARG_ENABLE([checking],
         to disabled)])],
     [enable_checking="$enableval"],
     [enable_checking="no"])
+AC_ARG_ENABLE([debug-locks],
+    [AS_HELP_STRING([--enable-debug-locks],
+       [turn on lock debugging assertions (defaults to disabled)])],
+    [enable_debug_locks="$enableval"],
+    [enable_debug_locks="no"])
 AC_ARG_ENABLE([debug-kernel],
     [AS_HELP_STRING([--enable-debug-kernel],
         [enable compilation of the kernel module with debugging information
@@ -1412,6 +1417,10 @@ AS_IF([test "x$enable_gtx" != "xno"],
        
 OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
+if test "$enable_debug_locks" = yes; then
+       AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr])
+fi
+
 dnl Don't build PAM on IRIX; the interface doesn't work for us.
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
         case $AFS_SYSNAME in

diff --git a/src/opr/lockstub.h b/src/opr/lockstub.h
index 2db610b3cee94b5c4539798130dd4d672b43280d..db375b23f102209d6e46817e627012fe1d0c71b8 100644 (file)
--- a/src/opr/lockstub.h
+++ b/src/opr/lockstub.h
@@ -37,6 +37,7 @@
 typedef int opr_cv_t;
 
 # define opr_mutex_init(mutex)
+# define opr_mutex_assert(mutex)
 # define opr_mutex_destroy(mutex)
 # define opr_mutex_enter(mutex)
 # define opr_mutex_exit(mutex)

diff --git a/src/opr/opr_lock.h b/src/opr/opr_lock.h
index 0d524e4808d5c0303cf5744d03e9ed6118113fbe..6051c5de720fe0e5afc9e8ff7f51ea520a7085ec 100644 (file)
--- a/src/opr/opr_lock.h
+++ b/src/opr/opr_lock.h
@@ -26,11 +26,35 @@
 
 #include <pthread.h>
 
+/* Mutexes */
+
 typedef pthread_mutex_t opr_mutex_t;
 
-# define opr_mutex_init(mutex) \
+# ifdef OPR_DEBUG_LOCKS
+static_inline void
+opr_mutex_init(opr_mutex_t *mutex)
+{
+    pthread_mutexattr_t attr;
+
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+
+    opr_Verify(pthread_mutex_init(mutex, &attr) == 0);
+    pthread_mutexattr_destroy(&attr);
+}
+
+#  define opr_mutex_assert(mutex) \
+    opr_Verify(pthread_mutex_lock(mutex) == EDEADLK)
+
+# else
+
+#  define opr_mutex_init(mutex) \
     opr_Verify(pthread_mutex_init(mutex, NULL) == 0)
 
+#  define opr_mutex_assert(mutex)
+
+# endif
+
 # define opr_mutex_destroy(mutex) \
     opr_Verify(pthread_mutex_destroy(mutex) == 0)
 

diff --git a/src/rx/AIX/rx_kmutex.h b/src/rx/AIX/rx_kmutex.h
index 381922c3650ec2513ac72ed763ef25215993fce0..4e624c6fd52e101bf839679e7b48d4476993913e 100644 (file)
--- a/src/rx/AIX/rx_kmutex.h
+++ b/src/rx/AIX/rx_kmutex.h
@@ -132,11 +132,7 @@ typedef tid_t afs_kcondvar_t;
 
 #define        MUTEX_DEFAULT   0
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a)        (lock_mine((void *)(a)))
-
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
+#define MUTEX_ASSERT(a)        osi_Assert(lock_mine((void *)(a)))
 
 #endif /* AFS_AIX41_ENV */
 

diff --git a/src/rx/DARWIN/rx_kmutex.h b/src/rx/DARWIN/rx_kmutex.h
index 31e97c8e78e91602eee8f0f2c663a9e0b1d13445..0fe6aa808c84c8375753074ba647bd6bb27ca49f 100644 (file)
--- a/src/rx/DARWIN/rx_kmutex.h
+++ b/src/rx/DARWIN/rx_kmutex.h
@@ -170,8 +170,7 @@ extern lck_grp_t * openafs_lck_grp;
         lck_mtx_unlock((a)->meta); \
     } while(0)
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == current_thread())
+#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == current_thread())
 #else
 typedef struct {
     struct lock__bsd__ lock;
@@ -208,11 +207,7 @@ typedef int afs_kcondvar_t;
        lockmgr(&(a)->lock, LK_RELEASE, 0, current_proc()); \
     } while(0);
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == current_thread())
+#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == current_thread())
 #endif
 
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-
 #endif /* _RX_KMUTEX_H_ */

diff --git a/src/rx/FBSD/rx_kmutex.h b/src/rx/FBSD/rx_kmutex.h
index 2b9834301a15d2c9c180ebeb5b9b14b1c9ba7fb8..a694a52b1bb83e465f5abbdffaf556d97c2e605b 100644 (file)
--- a/src/rx/FBSD/rx_kmutex.h
+++ b/src/rx/FBSD/rx_kmutex.h
@@ -56,8 +56,7 @@ typedef struct {
        (a)->owner = 0; \
     } while(0);
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curproc)
+#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == curproc)
 
 #elif defined(AFS_FBSD70_ENV) /* dunno about 6.x */
 
@@ -94,9 +93,8 @@ typedef struct mtx afs_kmutex_t;
        mtx_unlock((a)); \
     } while(0);
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a)                                \
-    ( mtx_owned((a)) )
+#define MUTEX_ASSERT(a)                                \
+    osi_Assert(mtx_owned((a)))
 
 #else
 
@@ -132,15 +130,9 @@ typedef struct {
        lockmgr(&(a)->lock, LK_RELEASE, 0, curthread); \
     } while(0);
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curthread)
+#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == curthread)
 #endif
 
-
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-
-
 /*
  * Condition variables
  *

diff --git a/src/rx/HPUX/rx_kmutex.h b/src/rx/HPUX/rx_kmutex.h
index 3e98f0f34b7c5d5020826f093be45e6c8599c1c7..89ebaf02328c37656b6fff5bd4a255ab93c46820 100644 (file)
--- a/src/rx/HPUX/rx_kmutex.h
+++ b/src/rx/HPUX/rx_kmutex.h
@@ -132,8 +132,6 @@ typedef caddr_t afs_kcondvar_t;
 #ifdef AFS_HPUX102_ENV
 
 #if defined(AFS_HPUX110_ENV)
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
 
 #define AFS_RX_ORDER 30
 
@@ -155,18 +153,16 @@ extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
     ((b_owns_sema(a)) ? b_vsema(a) : (osi_Panic("mutex not held"), 0))
 #endif
 
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a) b_owns_sema(a)
+#define MUTEX_ASSERT(a) osi_Assert(b_owns_sema(a))
 
 #else /* AFS_HPUX110_ENV */
 
-#define osirx_AssertMine(addr, msg)
-
 #define MUTEX_DESTROY(a)
 #define MUTEX_ENTER(a)
 #define MUTEX_TRYENTER(a) 1
 #define MUTEX_EXIT(a)
 #define MUTEX_INIT(a,b,c,d)
+#define MUTEX_ASSERT(a)
 
 #endif /* else AFS_HPUX110_ENV */
 #endif /* AFS_HPUX102_ENV */

diff --git a/src/rx/IRIX/rx_kmutex.h b/src/rx/IRIX/rx_kmutex.h
index 7c48725c8d82af9c05ee876e8fb7f59c8ef155dc..5767a553027f02b5cd43720619aece20b8c7c4f4 100644 (file)
--- a/src/rx/IRIX/rx_kmutex.h
+++ b/src/rx/IRIX/rx_kmutex.h
@@ -42,14 +42,11 @@ typedef kcondvar_t afs_kcondvar_t;
 #define MUTEX_INIT(a,b,c,d)  mutex_init(a,b,c,d)
 #endif
 #define MUTEX_DESTROY(a) mutex_destroy(a)
-#undef MUTEX_ISMINE
-#define MUTEX_ISMINE(a)        1
+#define MUTEX_ASSERT(a)
 #define CV_INIT(cv, a,b,c)     cv_init(cv, a, b, c)
 #define CV_SIGNAL(_cv)         cv_signal(_cv)
 #define CV_BROADCAST(_cv)      cv_broadcast(_cv)
 #define CV_DESTROY(_cv)                cv_destroy(_cv)
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
 #ifdef AFS_SGI64_ENV
 /* Add PLTWAIT for afsd's to wait so we don't rack up the load average. */
 #ifdef AFS_SGI65_ENV
@@ -144,13 +141,11 @@ extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
 #else /* MP */
 #define MUTEX_INIT(m, nm, type , a)
 #define MUTEX_DESTROY(a)
-#define MUTEX_ISMINE(a)        1
+#define MUTEX_ASSERT(a)
 #define MUTEX_ENTER(a)
 #define MUTEX_TRYENTER(a) 1
 #define MUTEX_EXIT(a)
 
-#define osirx_AssertMine(addr, msg)
-
 #define CV_INIT(cv, a,b,c)
 #define CV_SIGNAL(_cv)
 #define CV_BROADCAST(_cv)

diff --git a/src/rx/LINUX/rx_kmutex.h b/src/rx/LINUX/rx_kmutex.h
index d9f38a943b3bfc22323e8226f148ddb9178cf7d4..eb396e3a96b717568f5a40fff75573329f0805a0 100644 (file)
--- a/src/rx/LINUX/rx_kmutex.h
+++ b/src/rx/LINUX/rx_kmutex.h
@@ -52,10 +52,10 @@ typedef struct afs_kcondvar {
     wait_queue_head_t waitq;
 } afs_kcondvar_t;
 
-static inline int
-MUTEX_ISMINE(afs_kmutex_t * l)
+static inline void
+MUTEX_ASSERT(afs_kmutex_t * l)
 {
-    return l->owner == current->pid;
+    osi_Assert(l->owner == current->pid);
 }
 
 #define MUTEX_INIT(a,b,c,d)    afs_mutex_init(a)

diff --git a/src/rx/LINUX24/rx_kmutex.h b/src/rx/LINUX24/rx_kmutex.h
index 18e65f9653d5d6b4055443251c4cea232b07e649..c3590b9cb8033447c2c8c01ab0eefbe709ffd34d 100644 (file)
--- a/src/rx/LINUX24/rx_kmutex.h
+++ b/src/rx/LINUX24/rx_kmutex.h
@@ -56,10 +56,10 @@ typedef struct afs_kcondvar {
 #endif
 } afs_kcondvar_t;
 
-static inline int
-MUTEX_ISMINE(afs_kmutex_t * l)
+static inline void
+MUTEX_ASSERT(afs_kmutex_t * l)
 {
-    return l->owner == current->pid;
+    osi_Assert(l->owner == current->pid);
 }
 
 #define MUTEX_INIT(a,b,c,d)    afs_mutex_init(a)

diff --git a/src/rx/NBSD/rx_kmutex.h b/src/rx/NBSD/rx_kmutex.h
index a3240ff8512b3c6059a04df505c98d2eaa42785f..80f588debdac13e3d3b9dedae8f2f6d36db15b23 100644 (file)
--- a/src/rx/NBSD/rx_kmutex.h
+++ b/src/rx/NBSD/rx_kmutex.h
@@ -43,7 +43,7 @@ typedef kmutex_t afs_kmutex_t;
 #define MUTEX_ENTER(a) mutex_enter((a));
 #define MUTEX_TRYENTER(a) mutex_tryenter((a))
 #define MUTEX_EXIT(a) mutex_exit((a))
-#define MUTEX_ISMINE(a) mutex_owned((a))
+#define MUTEX_ASSERT(a) osi_Assert(mutex_owned((a)))
 
 typedef kcondvar_t afs_kcondvar_t;
 int afs_cv_wait(afs_kcondvar_t *, afs_kmutex_t *, int);
@@ -149,8 +149,8 @@ typedef struct {
     } while(0);
 #endif  /* LOCKDEBUG */
 
-#define MUTEX_ISMINE(a) \
-    (lockstatus(a) == LK_EXCLUSIVE)
+#define MUTEX_ASSERT(a) \
+    osi_Assert((lockstatus(a) == LK_EXCLUSIVE))
 #define MUTEX_LOCKED(a) \
     (lockstatus(a) == LK_EXCLUSIVE)
 

diff --git a/src/rx/OBSD/rx_kmutex.h b/src/rx/OBSD/rx_kmutex.h
index 7034613eac489de2dd449e15fbecb3e24427b56d..a9e57bcc0829606ae5a053351eb9ac3f7b617c83 100644 (file)
--- a/src/rx/OBSD/rx_kmutex.h
+++ b/src/rx/OBSD/rx_kmutex.h
@@ -64,6 +64,6 @@ typedef struct {
        osi_Assert((a)->owner == curproc); \
        (a)->owner = 0; \
     } while(0);
-#define MUTEX_ISMINE(a) (((afs_kmutex_t *)(a))->owner == curproc)
+#define MUTEX_ASSERT(a) osi_Assert(((afs_kmutex_t *)(a))->owner == curproc)
 
 #endif /* _RX_KMUTEX_H_ */

diff --git a/src/rx/SOLARIS/rx_kmutex.h b/src/rx/SOLARIS/rx_kmutex.h
index 3e74ae656270fd43c81e683eee9a40119f36e530..c57002595fb82742aaf4a0a09678fa28a89d4ee0 100644 (file)
--- a/src/rx/SOLARIS/rx_kmutex.h
+++ b/src/rx/SOLARIS/rx_kmutex.h
@@ -27,12 +27,9 @@
 typedef kmutex_t afs_kmutex_t;
 typedef kcondvar_t afs_kcondvar_t;
 
-#undef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-
 #define MUTEX_DESTROY(a)       mutex_destroy(a)
 #define MUTEX_INIT(a,b,c,d)    mutex_init(a, b, c, d)
-#define MUTEX_ISMINE(a)                mutex_owned((afs_kmutex_t *)(a))
+#define MUTEX_ASSERT(a)                osi_Assert(mutex_owned((afs_kmutex_t *)(a)))
 #define CV_INIT(a,b,c,d)       cv_init(a, b, c, d)
 #define CV_DESTROY(a)          cv_destroy(a)
 #define CV_SIGNAL(a)           cv_signal(a)

diff --git a/src/rx/UKERNEL/rx_kmutex.h b/src/rx/UKERNEL/rx_kmutex.h
index 95668f6911039b23c89d12ebd60c9e6691bb2ae8..0602de6f5047242b629d56dca453687baeb7c74c 100644 (file)
--- a/src/rx/UKERNEL/rx_kmutex.h
+++ b/src/rx/UKERNEL/rx_kmutex.h
@@ -23,9 +23,9 @@
 #define MUTEX_INIT(A,B,C,D)    usr_mutex_init(A)
 #define MUTEX_ENTER(A)         usr_mutex_lock(A)
 #define MUTEX_TRYENTER(A)      usr_mutex_trylock(A)
-#define MUTEX_ISMINE(A)                (1)
 #define MUTEX_EXIT(A)          usr_mutex_unlock(A)
 #define MUTEX_DESTROY(A)       usr_mutex_destroy(A)
+#define MUTEX_ASSERT(A)
 #define CV_INIT(A,B,C,D)       usr_cond_init(A)
 #define CV_TIMEDWAIT(A,B,C)    usr_cond_timedwait(A,B,C)
 #define CV_SIGNAL(A)           usr_cond_signal(A)
@@ -44,10 +44,6 @@
                                    } \
                                }
 
-#ifndef UKERNEL
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-#endif
-
 #define SPLVAR
 #define NETPRI
 #define USERPRI

diff --git a/src/rx/rx.c b/src/rx/rx.c
index bb3a852f0969d0f57ffa988002bc78f7aa5ff65a..45861e5a4e4b9c13926e022205dee7b7160d435f 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -1414,7 +1414,7 @@ rxi_WaitforTQBusy(struct rx_call *call) {
     while (!call->error && (call->flags & RX_CALL_TQ_BUSY)) {
        call->flags |= RX_CALL_TQ_WAIT;
        call->tqWaiters++;
-       osirx_AssertMine(&call->lock, "rxi_WaitforTQ lock");
+       MUTEX_ASSERT(&call->lock);
        CV_WAIT(&call->cv_tq, &call->lock);
        call->tqWaiters--;
        if (call->tqWaiters == 0) {
@@ -1431,7 +1431,7 @@ rxi_WakeUpTransmitQueue(struct rx_call *call)
        dpf(("call %"AFS_PTR_FMT" has %d waiters and flags %d\n",
             call, call->tqWaiters, call->flags));
 #ifdef RX_ENABLE_LOCKS
-       osirx_AssertMine(&call->lock, "rxi_Start start");
+       MUTEX_ASSERT(&call->lock);
        CV_BROADCAST(&call->cv_tq);
 #else /* RX_ENABLE_LOCKS */
        osi_rxWakeup(&call->tq);
@@ -3544,7 +3544,7 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket,
        return np;
     }
 
-    osirx_AssertMine(&call->lock, "rxi_ReceivePacket middle");
+    MUTEX_ASSERT(&call->lock);
     /* Set remote user defined status from packet */
     call->remoteStatus = np->header.userStatus;
 
@@ -5220,9 +5220,7 @@ rx_InterruptCall(struct rx_call *call, afs_int32 error)
 void
 rxi_CallError(struct rx_call *call, afs_int32 error)
 {
-#ifdef DEBUG
-    osirx_AssertMine(&call->lock, "rxi_CallError");
-#endif
+    MUTEX_ASSERT(&call->lock);
     dpf(("rxi_CallError call %"AFS_PTR_FMT" error %d call->error %d\n", call, error, call->error));
     if (call->error)
        error = call->error;
@@ -5250,9 +5248,8 @@ rxi_ResetCall(struct rx_call *call, int newcall)
     int flags;
     struct rx_peer *peer;
     struct rx_packet *packet;
-#ifdef DEBUG
-    osirx_AssertMine(&call->lock, "rxi_ResetCall");
-#endif
+
+    MUTEX_ASSERT(&call->lock);
     dpf(("rxi_ResetCall(call %"AFS_PTR_FMT", newcall %d)\n", call, newcall));
 
     /* Notify anyone who is waiting for asynchronous packet arrival */
@@ -7972,15 +7969,6 @@ shutdown_rx(void)
     UNLOCK_RX_INIT;
 }
 
-#ifdef RX_ENABLE_LOCKS
-void
-osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg)
-{
-    if (!MUTEX_ISMINE(lockaddr))
-       osi_Panic("Lock not held: %s", msg);
-}
-#endif /* RX_ENABLE_LOCKS */
-
 #ifndef KERNEL
 
 /*

diff --git a/src/rx/rx_lwp.h b/src/rx/rx_lwp.h
index 3bfe8c99272ec7037235251975d55426dc11557c..6ce407f4b2432408bc10a940e2fae5413ad115cf 100644 (file)
--- a/src/rx/rx_lwp.h
+++ b/src/rx/rx_lwp.h
@@ -29,14 +29,13 @@ typedef int afs_kmutex_t;
 #define MUTEX_TRYENTER(a) 1
 #define MUTEX_EXIT(a)
 #define MUTEX_INIT(a,b,c,d)
-#define MUTEX_ISMINE(a)
+#define MUTEX_ASSERT(a)
 #define CV_INIT(a,b,c,d)
 #define CV_DESTROY(a)
 #define CV_WAIT(cv, l)
 #define CV_SIGNAL(cv)
 #define CV_BROADCAST(cv)
 #define CV_TIMEDWAIT(cv, l, t)
-#define osirx_AssertMine(a, b)
 
 #endif /* KERNEL */
 

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index eebee69ab0a7674016d2ce073dd95d598a6595cb..f83f181d12b0fced7c46291b7f5b4d52b043fabc 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -122,9 +122,6 @@ extern afs_int32 rx_GetServerPeers(osi_socket socket, afs_uint32 remoteAddr,
 extern afs_int32 rx_GetLocalPeers(afs_uint32 peerHost, afs_uint16 peerPort,
                                      struct rx_debugPeer * peerStats);
 extern void shutdown_rx(void);
-#ifndef osirx_AssertMine
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-#endif
 #ifndef KERNEL
 extern int rx_KeyCreate(rx_destructor_t rtn);
 #endif

diff --git a/src/rx/rx_pthread.h b/src/rx/rx_pthread.h
index 1eec91da48cd697ccf455615091d30c964a6c64f..4b38ef8a9d3f5542585045f3c4964bb8900e48af 100644 (file)
--- a/src/rx/rx_pthread.h
+++ b/src/rx/rx_pthread.h
@@ -8,7 +8,7 @@
  */
 
 /* rx_pthread.h defines the lock and cv primitives required for a thread
- * safe user mode rx. The current implemenation is only tested on Solaris.
+ * safe user mode rx.
  */
 
 #ifndef RX_PTHREAD_H
@@ -31,11 +31,6 @@
 
 typedef pthread_mutex_t afs_kmutex_t;
 typedef pthread_cond_t afs_kcondvar_t;
-#ifdef RX_ENABLE_LOCKS
-#define MUTEX_ISMINE(l) (pthread_mutex_trylock(l) == EDEADLK)
-#else
-#define MUTEX_ISMINE(l) (1)
-#endif
 
 #define pthread_yield() Sleep(0)
 
@@ -54,27 +49,14 @@ typedef pthread_cond_t afs_kcondvar_t;
 #if !defined(pthread_yield) && (_XOPEN_SOURCE + 0) >= 500
 #define pthread_yield() sched_yield()
 #endif
-
-
-#ifndef MUTEX_ISMINE
-/* Only used for debugging. */
-#ifdef AFS_SUN5_ENV
-/* synch.h says mutex_t and pthread_mutex_t are always the same */
-#include <synch.h>
-#define MUTEX_ISMINE(l) MUTEX_HELD((mutex_t *) l)
-#else /* AFS_SUN5_ENV */
-#define MUTEX_ISMINE(l) (1)
-#endif /* AFS_SUN5_ENV */
-#endif /* !MUTEX_ISMINE */
 #endif /* AFS_NT40_ENV */
 
-extern void osirx_AssertMine(afs_kmutex_t * lockaddr, char *msg);
-
 #define MUTEX_INIT(a, b, c, d) opr_mutex_init(a)
 #define MUTEX_DESTROY(l) opr_mutex_destroy(l)
 #define MUTEX_ENTER(l) opr_mutex_enter(l)
 #define MUTEX_TRYENTER(l) opr_mutex_tryenter(l)
 #define MUTEX_EXIT(l) opr_mutex_exit(l)
+#define MUTEX_ASSERT(l) opr_mutex_assert(l)
 #define CV_INIT(cv, a, b, c) opr_cv_init(cv)
 #define CV_DESTROY(cv) opr_cv_destroy(cv)
 #define CV_WAIT(cv, l) opr_cv_wait(cv, l)

diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index 9db42a467e128a5fba8d82d903fcfd746fd7c914..5f0e0b6f56316498e5df65c6107381fbdede9494 100644 (file)
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -18,6 +18,7 @@
 #include <afs/param.h>
 
 #include <roken.h>
+#include <afs/opr.h>
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
@@ -33,7 +34,6 @@
 # include <opr/lockstub.h>
 #endif
 
-#include <afs/opr.h>
 #include <rx/rx_queue.h>
 #include <rx/xdr.h>
 #include <afs/afsint.h>