From 535f8e46a030eda99b08e7a4fd03b0e6cdaa6d5e Mon Sep 17 00:00:00 2001 From: Thomas Bushnell Date: Thu, 24 Oct 1996 19:29:49 +0000 Subject: Mon Oct 21 22:05:48 1996 Thomas Bushnell, n/BSG * i386/csw.S (CALL_MCOUNT): New macro. (cproc_swtich, cproc_start_wait, cproc_prepare): Use CALL_MCOUNT. * rwlock.h: Change extern inline protection to use new canonical method. * rwlock.c: Rewritten. --- libthreads/rwlock.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'libthreads/rwlock.h') diff --git a/libthreads/rwlock.h b/libthreads/rwlock.h index 7abbfff1..1a61eeea 100644 --- a/libthreads/rwlock.h +++ b/libthreads/rwlock.h @@ -31,17 +31,12 @@ struct rwlock int readers_waiting; }; -#ifdef _RWLOCK_DEFINE_FUNCTIONS -#undef _EXTERN_INLINE -#define _EXTERN_INLINE -#else /* ! _RWLOCK_DEFINE_FUNCTIONS */ -#ifndef _EXTERN_INLINE -#define _EXTERN_INLINE extern __inline +#ifndef RWLOCK_EI +#define RWLOCK_EI extern inline #endif -#endif /* _RWLOCK_DEFINE_FUNCTIONS */ /* Get a reader lock on reader-writer lock LOCK for disknode DN */ -_EXTERN_INLINE void +RWLOCK_EI void rwlock_reader_lock (struct rwlock *lock) { mutex_lock (&lock->master); @@ -58,7 +53,7 @@ rwlock_reader_lock (struct rwlock *lock) } /* Get a writer lock on reader-writer lock LOCK for disknode DN */ -_EXTERN_INLINE void +RWLOCK_EI void rwlock_writer_lock (struct rwlock *lock) { mutex_lock (&lock->master); @@ -75,7 +70,7 @@ rwlock_writer_lock (struct rwlock *lock) } /* Release a reader lock on reader-writer lock LOCK for disknode DN */ -_EXTERN_INLINE void +RWLOCK_EI void rwlock_reader_unlock (struct rwlock *lock) { mutex_lock (&lock->master); @@ -87,7 +82,7 @@ rwlock_reader_unlock (struct rwlock *lock) } /* Release a writer lock on reader-writer lock LOCK for disknode DN */ -_EXTERN_INLINE void +RWLOCK_EI void rwlock_writer_unlock (struct rwlock *lock) { mutex_lock (&lock->master); @@ -99,7 +94,7 @@ rwlock_writer_unlock (struct rwlock *lock) } /* Initialize reader-writer lock LOCK */ -_EXTERN_INLINE void +RWLOCK_EI void rwlock_init (struct rwlock *lock) { mutex_init (&lock->master); -- cgit v1.2.3