aboutsummaryrefslogtreecommitdiff
path: root/src/backend/storage/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/storage/ipc')
-rw-r--r--src/backend/storage/ipc/Makefile4
-rw-r--r--src/backend/storage/ipc/ipc.c91
-rw-r--r--src/backend/storage/ipc/s_lock.c525
-rw-r--r--src/backend/storage/ipc/spin.c88
4 files changed, 91 insertions, 617 deletions
diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile
index 821bf688cf0..e5517135d33 100644
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@@ -4,7 +4,7 @@
# Makefile for storage/ipc
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.3 1996/11/09 06:21:47 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.4 1997/09/18 14:20:08 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,7 @@ INCLUDE_OPT = -I../.. \
CFLAGS+=$(INCLUDE_OPT)
-OBJS = ipc.o ipci.o s_lock.o shmem.o shmqueue.o sinval.o \
+OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \
sinvaladt.o spin.o
all: SUBSYS.o
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 856ca135080..2ef50c5c919 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.14 1997/09/08 21:46:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.15 1997/09/18 14:20:14 momjian Exp $
*
* NOTES
*
@@ -33,6 +33,7 @@
#include "postgres.h"
#include "storage/ipc.h"
+#include "storage/s_lock.h"
/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
#include <sys/sem.h>
#include <sys/shm.h>
@@ -615,7 +616,10 @@ IpcMemoryKill(IpcMemoryKey memKey)
* supply of locks.
* ------------------
*/
-static SLock *SLockArray = NULL;
+
+/* used in spin.c */
+SLock *SLockArray = NULL;
+
static SLock **FreeSLockPP;
static int *UnusedSLockIP;
static slock_t *SLockMemoryLock;
@@ -676,92 +680,13 @@ AttachSLockMemory(IPCKey key)
return;
}
-
-#ifdef LOCKDEBUG
-#define PRINT_LOCK(LOCK) printf("(locklock = %d, flag = %d, nshlocks = %d, \
-shlock = %d, exlock =%d)\n", LOCK->locklock, \
- LOCK->flag, LOCK->nshlocks, LOCK->shlock, \
- LOCK->exlock)
-#endif
-
-void
-ExclusiveLock(int lockid)
-{
- SLock *slckP;
-
- slckP = &(SLockArray[lockid]);
-#ifdef LOCKDEBUG
- printf("ExclusiveLock(%d)\n", lockid);
- printf("IN: ");
- PRINT_LOCK(slckP);
-#endif
-ex_try_again:
- S_LOCK(&(slckP->locklock));
- switch (slckP->flag)
- {
- case NOLOCK:
- slckP->flag = EXCLUSIVELOCK;
- S_LOCK(&(slckP->exlock));
- S_LOCK(&(slckP->shlock));
- S_UNLOCK(&(slckP->locklock));
-#ifdef LOCKDEBUG
- printf("OUT: ");
- PRINT_LOCK(slckP);
-#endif
- return;
- case SHAREDLOCK:
- case EXCLUSIVELOCK:
- S_UNLOCK(&(slckP->locklock));
- S_LOCK(&(slckP->exlock));
- S_UNLOCK(&(slckP->exlock));
- goto ex_try_again;
- }
-}
-
-void
-ExclusiveUnlock(int lockid)
-{
- SLock *slckP;
-
- slckP = &(SLockArray[lockid]);
-#ifdef LOCKDEBUG
- printf("ExclusiveUnlock(%d)\n", lockid);
- printf("IN: ");
- PRINT_LOCK(slckP);
-#endif
- S_LOCK(&(slckP->locklock));
- /* -------------
- * give favor to read processes
- * -------------
- */
- slckP->flag = NOLOCK;
- if (slckP->nshlocks > 0)
- {
- while (slckP->nshlocks > 0)
- {
- S_UNLOCK(&(slckP->shlock));
- S_LOCK(&(slckP->comlock));
- }
- S_UNLOCK(&(slckP->shlock));
- }
- else
- {
- S_UNLOCK(&(slckP->shlock));
- }
- S_UNLOCK(&(slckP->exlock));
- S_UNLOCK(&(slckP->locklock));
-#ifdef LOCKDEBUG
- printf("OUT: ");
- PRINT_LOCK(slckP);
-#endif
- return;
-}
-
+#ifdef NOT_USED
bool
LockIsFree(int lockid)
{
return (SLockArray[lockid].flag == NOLOCK);
}
+#endif
#endif /* HAS_TEST_AND_SET */
diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c
deleted file mode 100644
index 82551f8b96d..00000000000
--- a/src/backend/storage/ipc/s_lock.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * s_lock.c--
- * This file contains the implementation (if any) for spinlocks.
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.24 1997/09/08 21:47:04 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-/*
- * DESCRIPTION
- * The following code fragment should be written (in assembly
- * language) on machines that have a native test-and-set instruction:
- *
- * void
- * S_LOCK(char_address)
- * char *char_address;
- * {
- * while (test_and_set(char_address))
- * ;
- * }
- *
- * If this is not done, POSTGRES will default to using System V
- * semaphores (and take a large performance hit -- around 40% of
- * its time on a DS5000/240 is spent in semop(3)...).
- *
- * NOTES
- * AIX has a test-and-set but the recommended interface is the cs(3)
- * system call. This provides an 8-instruction (plus system call
- * overhead) uninterruptible compare-and-set operation. True
- * spinlocks might be faster but using cs(3) still speeds up the
- * regression test suite by about 25%. I don't have an assembler
- * manual for POWER in any case.
- *
- */
-#include "postgres.h"
-
-#include "storage/ipc.h"
-
-
-#if defined(HAS_TEST_AND_SET)
-
-#if defined (nextstep)
-/*
- * NEXTSTEP (mach)
- * slock_t is defined as a struct mutex.
- */
-void
-S_LOCK(slock_t *lock)
-{
- mutex_lock(lock);
-}
-void
-S_UNLOCK(slock_t *lock)
-{
- mutex_unlock(lock);
-}
-void
-S_INIT_LOCK(slock_t *lock)
-{
- mutex_init(lock);
-}
-
- /* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */
-int
-S_LOCK_FREE(slock_t *lock)
-{
-/* For Mach, we have to delve inside the entrails of `struct mutex'. Ick! */
- return (lock->lock == 0);
-}
-
-#endif /* next */
-
-
-
-#if defined(irix5)
-/*
- * SGI IRIX 5
- * slock_t is defined as a struct abilock_t, which has a single unsigned long
- * member.
- *
- * This stuff may be supplemented in the future with Masato Kataoka's MIPS-II
- * assembly from his NECEWS SVR4 port, but we probably ought to retain this
- * for the R3000 chips out there.
- */
-void
-S_LOCK(slock_t *lock)
-{
- /* spin_lock(lock); */
- while (!acquire_lock(lock))
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- release_lock(lock);
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- init_lock(lock);
-}
-
-/* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */
-int
-S_LOCK_FREE(slock_t *lock)
-{
- return (stat_lock(lock) == UNLOCKED);
-}
-
-#endif /* irix5 */
-
-
-/*
- * OSF/1 (Alpha AXP)
- *
- * Note that slock_t on the Alpha AXP is msemaphore instead of char
- * (see storage/ipc.h).
- */
-
-#if defined(__alpha__) || defined(__alpha)
-
-void
-S_LOCK(slock_t *lock)
-{
- while (msem_lock(lock, MSEM_IF_NOWAIT) < 0)
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- msem_unlock(lock, 0);
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- msem_init(lock, MSEM_UNLOCKED);
-}
-
-int
-S_LOCK_FREE(slock_t *lock)
-{
- return (lock->msem_state ? 0 : 1);
-}
-
-#endif /* alpha */
-
-/*
- * Solaris 2
- */
-
-#if defined(i386_solaris) || \
- defined(sparc_solaris)
-/* for xxxxx_solaris, this is defined in port/.../tas.s */
-
-static int tas(slock_t *lock);
-
-void
-S_LOCK(slock_t *lock)
-{
- while (tas(lock))
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* i86pc_solaris || sparc_solaris */
-
-/*
- * AIX (POWER)
- *
- * Note that slock_t on POWER/POWER2/PowerPC is int instead of char
- * (see storage/ipc.h).
- */
-
-#if defined(aix)
-
-void
-S_LOCK(slock_t *lock)
-{
- while (cs((int *) lock, 0, 1))
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* aix */
-
-/*
- * HP-UX (PA-RISC)
- *
- * Note that slock_t on PA-RISC is a structure instead of char
- * (see storage/ipc.h).
- */
-
-#if defined(hpux)
-
-/*
-* a "set" slock_t has a single word cleared. a "clear" slock_t has
-* all words set to non-zero.
-*/
-static slock_t clear_lock = {-1, -1, -1, -1};
-
-static int tas(slock_t *lock);
-
-void
-S_LOCK(slock_t *lock)
-{
- while (tas(lock))
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = clear_lock; /* struct assignment */
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-int
-S_LOCK_FREE(slock_t *lock)
-{
- register int *lock_word = (int *) (((long) lock + 15) & ~15);
-
- return (*lock_word != 0);
-}
-
-#endif /* hpux */
-
-/*
- * sun3
- */
-
-#if defined(sun3)
-
-static int tas(slock_t *lock);
-
-void
-S_LOCK(slock_t *lock)
-{
- while (tas(lock));
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-static int
-tas_dummy()
-{
- asm("LLA0:");
- asm(" .data");
- asm(" .text");
- asm("|#PROC# 04");
- asm(" .globl _tas");
- asm("_tas:");
- asm("|#PROLOGUE# 1");
- asm(" movel sp@(0x4),a0");
- asm(" tas a0@");
- asm(" beq LLA1");
- asm(" moveq #-128,d0");
- asm(" rts");
- asm("LLA1:");
- asm(" moveq #0,d0");
- asm(" rts");
- asm(" .data");
-}
-
-#endif /* sun3 */
-
-/*
- * sparc machines
- */
-
-#if defined(NEED_SPARC_TAS_ASM)
-
-/* if we're using -ansi w/ gcc, use __asm__ instead of asm */
-#if defined(__STRICT_ANSI__)
-#define asm(x) __asm__(x)
-#endif
-
-static int tas(slock_t *lock);
-
-static int
-tas_dummy()
-{
- asm(".seg \"data\"");
- asm(".seg \"text\"");
- asm(".global _tas");
- asm("_tas:");
-
- /*
- * Sparc atomic test and set (sparc calls it "atomic load-store")
- */
-
- asm("ldstub [%r8], %r8");
-
- /*
- * Did test and set actually do the set?
- */
-
- asm("tst %r8");
-
- asm("be,a ReturnZero");
-
- /*
- * otherwise, just return.
- */
-
- asm("clr %r8");
- asm("mov 0x1, %r8");
- asm("ReturnZero:");
- asm("retl");
- asm("nop");
-}
-
-void
-S_LOCK(unsigned char *addr)
-{
- while (tas(addr));
-}
-
-
-/*
- * addr should be as in the above S_LOCK routine
- */
-void
-S_UNLOCK(unsigned char *addr)
-{
- *addr = 0;
-}
-
-void
-S_INIT_LOCK(unsigned char *addr)
-{
- *addr = 0;
-}
-
-#endif /* NEED_SPARC_TAS_ASM */
-
-/*
- * i386 based things
- */
-
-#if defined(NEED_I386_TAS_ASM)
-
-void
-S_LOCK(slock_t *lock)
-{
- slock_t res;
-
- do
- {
-__asm__("xchgb %0,%1": "=q"(res), "=m"(*lock):"0"(0x1));
- } while (res != 0);
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* NEED_I386_TAS_ASM */
-
-
-#if defined(__alpha__) && defined(linux)
-
-void
-S_LOCK(slock_t *lock)
-{
- slock_t res;
-
- do
- {
-__asm__(" ldq $0, %0 \n\
- bne $0, already_set \n\
- ldq_l $0, %0 \n\
- bne $0, already_set \n\
- or $31, 1, $0 \n\
- stq_c $0, %0 \n\
- beq $0, stqc_fail \n\
- success: bis $31, $31, %1 \n\
- mb \n\
- jmp $31, end \n\
- stqc_fail: or $31, 1, $0 \n\
- already_set: bis $0, $0, %1 \n\
- end: nop ": "=m"(*lock), "=r"(res): :"0");
- } while (res != 0);
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- __asm__("mb");
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* defined(__alpha__) && defined(linux) */
-
-#if defined(linux) && defined(sparc)
-
-void
-S_LOCK(slock_t *lock)
-{
- slock_t res;
-
- do
- {
- __asm__("ldstub [%1], %0"
-: "=&r"(res)
-: "r"(lock));
- } while (!res != 0);
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* defined(linux) && defined(sparc) */
-
-#if defined(linux) && defined(PPC)
-
-static int
-tas_dummy()
-{
- __asm__(" \n\
-tas: \n\
- lwarx 5,0,3 \n\
- cmpwi 5,0 \n\
- bne fail \n\
- addi 5,5,1 \n\
- stwcx. 5,0,3 \n\
- beq success \n\
-fail: li 3,1 \n\
- blr \n\
-success: \n\
- li 3,0 \n\
- blr \n\
- ");
-}
-
-void
-S_LOCK(slock_t *lock)
-{
- while (tas(lock))
- ;
-}
-
-void
-S_UNLOCK(slock_t *lock)
-{
- *lock = 0;
-}
-
-void
-S_INIT_LOCK(slock_t *lock)
-{
- S_UNLOCK(lock);
-}
-
-#endif /* defined(linux) && defined(PPC) */
-
-#endif /* HAS_TEST_AND_SET */
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 3443c2db95b..5300e2ecd4d 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.8 1997/09/08 02:29:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.9 1997/09/18 14:20:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,6 +27,7 @@
#include <errno.h>
#include "postgres.h"
#include "storage/ipc.h"
+#include "storage/s_lock.h"
#include "storage/shmem.h"
#include "storage/spin.h"
#include "storage/proc.h"
@@ -80,18 +81,91 @@ InitSpinLocks(int init, IPCKey key)
return (TRUE);
}
+#ifdef LOCKDEBUG
+#define PRINT_LOCK(LOCK) printf("(locklock = %d, flag = %d, nshlocks = %d, \
+shlock = %d, exlock =%d)\n", LOCK->locklock, \
+ LOCK->flag, LOCK->nshlocks, LOCK->shlock, \
+ LOCK->exlock)
+#endif
+
+/* from ipc.c */
+extern SLock *SLockArray;
+
void
-SpinAcquire(SPINLOCK lock)
+SpinAcquire(SPINLOCK lockid)
{
- ExclusiveLock(lock);
- PROC_INCR_SLOCK(lock);
+ SLock *slckP;
+
+ /* This used to be in ipc.c, but move here to reduce function calls */
+ slckP = &(SLockArray[lockid]);
+#ifdef LOCKDEBUG
+ printf("SpinAcquire(%d)\n", lockid);
+ printf("IN: ");
+ PRINT_LOCK(slckP);
+#endif
+ex_try_again:
+ S_LOCK(&(slckP->locklock));
+ switch (slckP->flag)
+ {
+ case NOLOCK:
+ slckP->flag = EXCLUSIVELOCK;
+ S_LOCK(&(slckP->exlock));
+ S_LOCK(&(slckP->shlock));
+ S_UNLOCK(&(slckP->locklock));
+#ifdef LOCKDEBUG
+ printf("OUT: ");
+ PRINT_LOCK(slckP);
+#endif
+ return;
+ case SHAREDLOCK:
+ case EXCLUSIVELOCK:
+ S_UNLOCK(&(slckP->locklock));
+ S_LOCK(&(slckP->exlock));
+ S_UNLOCK(&(slckP->exlock));
+ goto ex_try_again;
+ }
+ PROC_INCR_SLOCK(lockid);
}
void
-SpinRelease(SPINLOCK lock)
+SpinRelease(SPINLOCK lockid)
{
- PROC_DECR_SLOCK(lock);
- ExclusiveUnlock(lock);
+ SLock *slckP;
+
+ PROC_DECR_SLOCK(lockid);
+
+ /* This used to be in ipc.c, but move here to reduce function calls */
+ slckP = &(SLockArray[lockid]);
+#ifdef LOCKDEBUG
+ printf("SpinRelease(%d)\n", lockid);
+ printf("IN: ");
+ PRINT_LOCK(slckP);
+#endif
+ S_LOCK(&(slckP->locklock));
+ /* -------------
+ * give favor to read processes
+ * -------------
+ */
+ slckP->flag = NOLOCK;
+ if (slckP->nshlocks > 0)
+ {
+ while (slckP->nshlocks > 0)
+ {
+ S_UNLOCK(&(slckP->shlock));
+ S_LOCK(&(slckP->comlock));
+ }
+ S_UNLOCK(&(slckP->shlock));
+ }
+ else
+ {
+ S_UNLOCK(&(slckP->shlock));
+ }
+ S_UNLOCK(&(slckP->exlock));
+ S_UNLOCK(&(slckP->locklock));
+#ifdef LOCKDEBUG
+ printf("OUT: ");
+ PRINT_LOCK(slckP);
+#endif
}
#else /* HAS_TEST_AND_SET */
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 04:52:26 +0000