aboutsummaryrefslogtreecommitdiff
path: root/db2/mutex
diff options
context:
space:
mode:
Diffstat (limited to 'db2/mutex')
-rw-r--r--db2/mutex/68020.gcc3
-rw-r--r--db2/mutex/mutex.c74
-rw-r--r--db2/mutex/parisc.gcc18
-rw-r--r--db2/mutex/parisc.hp4
-rw-r--r--db2/mutex/sco.cc24
5 files changed, 85 insertions, 38 deletions
diff --git a/db2/mutex/68020.gcc b/db2/mutex/68020.gcc
index 9d8be641d8..21410e61d4 100644
--- a/db2/mutex/68020.gcc
+++ b/db2/mutex/68020.gcc
@@ -1,5 +1,5 @@
/*
- * @(#)68020.gcc 10.1 (Sleepycat) 4/12/97
+ * @(#)68020.gcc 10.2 (Sleepycat) 2/15/98
*
* For gcc/68K, 0 is clear, 1 is set.
*/
@@ -16,4 +16,3 @@
#define TSL_UNSET(tsl) (*(tsl) = 0)
#define TSL_INIT(tsl) TSL_UNSET(tsl)
-
diff --git a/db2/mutex/mutex.c b/db2/mutex/mutex.c
index 6dca323113..de0d0e23fe 100644
--- a/db2/mutex/mutex.c
+++ b/db2/mutex/mutex.c
@@ -1,14 +1,14 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1996, 1997
+ * Copyright (c) 1996, 1997, 1998
* Sleepycat Software. All rights reserved.
*/
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
+static const char sccsid[] = "@(#)mutex.c 10.48 (Sleepycat) 5/23/98";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -16,14 +16,12 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
#include <errno.h>
#include <fcntl.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#endif
#include "db_int.h"
-#include "common_ext.h"
#ifdef HAVE_SPINLOCKS
@@ -43,13 +41,21 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
* Should we not use MSEM_IF_NOWAIT and let the system block for us?
* I've no idea if this will block all threads in the process or not.
*/
-#define TSL_INIT(x) msem_init(x, MSEM_UNLOCKED)
+#define TSL_INIT(x) (msem_init(x, MSEM_UNLOCKED) == NULL)
+#define TSL_INIT_ERROR 1
#define TSL_SET(x) (!msem_lock(x, MSEM_IF_NOWAIT))
#define TSL_UNSET(x) msem_unlock(x, 0)
#endif
+#ifdef HAVE_FUNC_RELIANT
+#define TSL_INIT(x) initspin(x, 1)
+#define TSL_SET(x) (cspinlock(x) == 0)
+#define TSL_UNSET(x) spinunlock(x)
+#endif
+
#ifdef HAVE_FUNC_SGI
-#define TSL_INIT(x) init_lock(x)
+#define TSL_INIT(x) (init_lock(x) != 0)
+#define TSL_INIT_ERROR 1
#define TSL_SET(x) (!acquire_lock(x))
#define TSL_UNSET(x) release_lock(x)
#endif
@@ -58,7 +64,8 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
/*
* Semaphore calls don't work on Solaris 5.5.
*
- * #define TSL_INIT(x) sema_init(x, 1, USYNC_PROCESS, NULL)
+ * #define TSL_INIT(x) (sema_init(x, 1, USYNC_PROCESS, NULL) != 0)
+ * #define TSL_INIT_ERROR 1
* #define TSL_SET(x) (sema_wait(x) == 0)
* #define TSL_UNSET(x) sema_post(x)
*/
@@ -67,6 +74,10 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
#define TSL_UNSET(x) _lock_clear(x)
#endif
+#ifdef HAVE_ASSEM_PARISC_GCC
+#include "parisc.gcc"
+#endif
+
#ifdef HAVE_ASSEM_SCO_CC
#include "sco.cc"
#endif
@@ -85,17 +96,20 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
#include "x86.gcc"
#endif
-#if defined(_WIN32)
-/* DBDB this needs to be byte-aligned!! */
+#ifdef WIN16
+/* Win16 spinlocks are simple because we cannot possibly be preempted. */
#define TSL_INIT(tsl)
-#define TSL_SET(tsl) (!InterlockedExchange((PLONG)tsl, 1))
+#define TSL_SET(tsl) (*(tsl) = 1)
#define TSL_UNSET(tsl) (*(tsl) = 0)
#endif
-#ifdef macintosh
-/* Mac spinlocks are simple because we cannot possibly be preempted. */
+#if defined(_WIN32)
+/*
+ * XXX
+ * DBDB this needs to be byte-aligned!!
+ */
#define TSL_INIT(tsl)
-#define TSL_SET(tsl) (*(tsl) = 1)
+#define TSL_SET(tsl) (!InterlockedExchange((PLONG)tsl, 1))
#define TSL_UNSET(tsl) (*(tsl) = 0)
#endif
@@ -105,14 +119,14 @@ static const char sccsid[] = "@(#)mutex.c 10.32 (Sleepycat) 1/16/98";
* __db_mutex_init --
* Initialize a DB mutex structure.
*
- * PUBLIC: void __db_mutex_init __P((db_mutex_t *, u_int32_t));
+ * PUBLIC: int __db_mutex_init __P((db_mutex_t *, u_int32_t));
*/
-void
+int
__db_mutex_init(mp, off)
db_mutex_t *mp;
u_int32_t off;
{
-#ifdef DEBUG
+#ifdef DIAGNOSTIC
if ((ALIGNTYPE)mp & (MUTEX_ALIGNMENT - 1)) {
(void)fprintf(stderr,
"MUTEX ERROR: mutex NOT %d-byte aligned!\n",
@@ -125,11 +139,17 @@ __db_mutex_init(mp, off)
#ifdef HAVE_SPINLOCKS
COMPQUIET(off, 0);
+#ifdef TSL_INIT_ERROR
+ if (TSL_INIT(&mp->tsl_resource))
+ return (errno);
+#else
TSL_INIT(&mp->tsl_resource);
+#endif
mp->spins = __os_spin();
#else
mp->off = off;
#endif
+ return (0);
}
#define MS(n) ((n) * 1000) /* Milliseconds to micro-seconds. */
@@ -147,17 +167,25 @@ __db_mutex_lock(mp, fd)
int fd;
{
u_long usecs;
-
#ifdef HAVE_SPINLOCKS
int nspins;
+#else
+ struct flock k_lock;
+ pid_t mypid;
+ int locked;
+#endif
+
+ if (!DB_GLOBAL(db_mutexlocks))
+ return (0);
+#ifdef HAVE_SPINLOCKS
COMPQUIET(fd, 0);
for (usecs = MS(10);;) {
/* Try and acquire the uncontested resource lock for N spins. */
for (nspins = mp->spins; nspins > 0; --nspins)
if (TSL_SET(&mp->tsl_resource)) {
-#ifdef DEBUG
+#ifdef DIAGNOSTIC
if (mp->pid != 0) {
(void)fprintf(stderr,
"MUTEX ERROR: __db_mutex_lock: lock currently locked\n");
@@ -182,9 +210,6 @@ __db_mutex_lock(mp, fd)
/* NOTREACHED */
#else /* !HAVE_SPINLOCKS */
- struct flock k_lock;
- pid_t mypid;
- int locked;
/* Initialize the lock. */
k_lock.l_whence = SEEK_SET;
@@ -246,7 +271,10 @@ __db_mutex_unlock(mp, fd)
db_mutex_t *mp;
int fd;
{
-#ifdef DEBUG
+ if (!DB_GLOBAL(db_mutexlocks))
+ return (0);
+
+#ifdef DIAGNOSTIC
if (mp->pid == 0) {
(void)fprintf(stderr,
"MUTEX ERROR: __db_mutex_unlock: lock already unlocked\n");
@@ -257,7 +285,7 @@ __db_mutex_unlock(mp, fd)
#ifdef HAVE_SPINLOCKS
COMPQUIET(fd, 0);
-#ifdef DEBUG
+#ifdef DIAGNOSTIC
mp->pid = 0;
#endif
diff --git a/db2/mutex/parisc.gcc b/db2/mutex/parisc.gcc
index e15f6f2dba..2e4540f767 100644
--- a/db2/mutex/parisc.gcc
+++ b/db2/mutex/parisc.gcc
@@ -1,5 +1,5 @@
-/*
- * @(#)parisc.gcc 8.5 (Sleepycat) 1/18/97
+/*
+ * @(#)parisc.gcc 8.8 (Sleepycat) 6/2/98
*
* Copyright (c) 1996-1997, The University of Utah and the Computer Systems
* Laboratory at the University of Utah (CSL). All rights reserved.
@@ -22,19 +22,15 @@
/*
* The PA-RISC has a "load and clear" instead of a "test and set" instruction.
- * The 32-bit word used by that instruction must be 16-byte aligned hence we
- * allocate 16 bytes for a tsl_t and use the word that is properly aligned.
- * We could use the "aligned" attribute in GCC but that doesn't work for stack
- * variables.
+ * The 32-bit word used by that instruction must be 16-byte aligned. We could
+ * use the "aligned" attribute in GCC but that doesn't work for stack variables.
*/
#define TSL_SET(tsl) ({ \
- int *__l = (int *)(((int)(tsl)+15)&~15); \
+ register tsl_t *__l = (tsl); \
int __r; \
asm volatile("ldcws 0(%1),%0" : "=r" (__r) : "r" (__l)); \
__r & 1; \
})
-#define TSL_UNSET(tsl) ({ \
- int *__l = (int *)(((int)(tsl)+15)&~15); \
- *__l = -1; \
-})
+#define TSL_UNSET(tsl) (*(tsl) = -1)
+#define TSL_INIT(tsl) TSL_UNSET(tsl)
diff --git a/db2/mutex/parisc.hp b/db2/mutex/parisc.hp
index d10807b7f1..bd0e37fc78 100644
--- a/db2/mutex/parisc.hp
+++ b/db2/mutex/parisc.hp
@@ -1,5 +1,5 @@
-/*
- * @(#)parisc.hp 8.5 (Sleepycat) 1/18/97
+/*
+ * @(#)parisc.hp 8.6 (Sleepycat) 6/2/98
*
* Copyright (c) 1996-1997, The University of Utah and the Computer Systems
* Laboratory at the University of Utah (CSL). All rights reserved.
diff --git a/db2/mutex/sco.cc b/db2/mutex/sco.cc
new file mode 100644
index 0000000000..7c165a2072
--- /dev/null
+++ b/db2/mutex/sco.cc
@@ -0,0 +1,24 @@
+/*
+ * @(#)x86.uslc
+ *
+ * UnixWare has threads in libthread, but OpenServer doesn't (yet).
+ *
+ * For cc/x86, 0 is clear, 1 is set.
+ */
+
+#if defined(__USLC__)
+asm int
+_tsl_set(void *tsl)
+{
+%mem tsl
+ movl tsl, %ecx
+ movl $1, %eax
+ lock
+ xchgb (%ecx),%al
+ xorl $1,%eax
+}
+#endif
+
+#define TSL_SET(tsl) _tsl_set(tsl)
+#define TSL_UNSET(tsl) (*(tsl) = 0)
+#define TSL_INIT(tsl) TSL_UNSET(tsl)
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-01-30 22:39:40 +0000