diff options
Diffstat (limited to 'db2/mutex')
| -rw-r--r-- | db2/mutex/mutex.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/db2/mutex/mutex.c b/db2/mutex/mutex.c index 5315b2d3fe..7c8ea6ebd1 100644 --- a/db2/mutex/mutex.c +++ b/db2/mutex/mutex.c @@ -8,7 +8,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "@(#)mutex.c 10.25 (Sleepycat) 9/23/97"; +static const char sccsid[] = "@(#)mutex.c 10.28 (Sleepycat) 10/31/97"; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -67,6 +67,10 @@ static const char sccsid[] = "@(#)mutex.c 10.25 (Sleepycat) 9/23/97"; #define TSL_UNSET(x) _lock_clear(x) #endif +#ifdef HAVE_ASSEM_SCO_CC +#include "sco.cc" +#endif + #ifdef HAVE_ASSEM_SPARC_GCC #include "sparc.gcc" #endif @@ -138,13 +142,12 @@ __db_mutex_init(mp, off) * __db_mutex_lock * Lock on a mutex, logically blocking if necessary. * - * PUBLIC: int __db_mutex_lock __P((db_mutex_t *, int, int (*)(void))); + * PUBLIC: int __db_mutex_lock __P((db_mutex_t *, int)); */ int -__db_mutex_lock(mp, fd, yield) +__db_mutex_lock(mp, fd) db_mutex_t *mp; int fd; - int (*yield) __P((void)); { u_long usecs; @@ -166,17 +169,15 @@ __db_mutex_lock(mp, fd, yield) } mp->pid = getpid(); #endif -#ifdef MUTEX_STATISTICS if (usecs == MS(10)) ++mp->mutex_set_nowait; else ++mp->mutex_set_wait; -#endif return (0); } /* Yield the processor; wait 10ms initially, up to 1 second. */ - if (yield == NULL || yield() != 0) { + if (__db_yield == NULL || __db_yield() != 0) { (void)__db_sleep(0, usecs); if ((usecs <<= 1) > SECOND) usecs = SECOND; @@ -200,7 +201,7 @@ __db_mutex_lock(mp, fd, yield) * up to 1 second. */ for (usecs = MS(10); mp->pid != 0;) - if (yield == NULL || yield() != 0) { + if (__db_yield == NULL || __db_yield() != 0) { (void)__db_sleep(0, usecs); if ((usecs <<= 1) > SECOND) usecs = SECOND; @@ -234,10 +235,6 @@ __db_mutex_lock(mp, fd, yield) if (locked) break; } - -#ifdef MUTEX_STATISTICS - ++mp->mutex_set_wait; -#endif return (0); #endif /* !HAVE_SPINLOCKS */ } |