diff options
| author | Bruce Momjian | 1998-06-23 15:35:48 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-06-23 15:35:48 +0000 |
| commit | cba0c6559aca9c3c8c50e1c6f8f1068ada1b7e8e (patch) | |
| tree | 42ceda01f7428aacbb1eeb245e4308e35b88540d /src/backend/storage/ipc | |
| parent | 62b124b4ee8f1d37363ba8c556730c06254889e4 (diff) | |
rename MAIN_MEMORY to STABLE_MEMORY_STORAGE
Diffstat (limited to 'src/backend/storage/ipc')
| -rw-r--r-- | src/backend/storage/ipc/ipci.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/ipc/spin.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 4da60cb9ac9..c0752089e74 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.8 1998/05/29 17:00:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.9 1998/06/23 15:35:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,9 +73,9 @@ CreateSharedMemoryAndSemaphores(IPCKey key) CreateSpinlocks(IPCKeyGetSpinLockSemaphoreKey(key)); size = BufferShmemSize() + LockShmemSize(); -#ifdef MAIN_MEMORY +#ifdef STABLE_MEMORY_STORAGE size += MMShmemSize(); -#endif /* MAIN_MEMORY */ +#endif if (DebugLvl > 1) { diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c index 0d6aac7fbae..d14a0dfd0a3 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.11 1998/06/15 19:29:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.12 1998/06/23 15:35:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,10 +60,10 @@ InitSpinLocks(int init, IPCKey key) extern SPINLOCK SInvalLock; extern SPINLOCK OidGenLockId; -#ifdef MAIN_MEMORY +#ifdef STABLE_MEMORY_STORAGE extern SPINLOCK MMCacheLock; -#endif /* SONY_JUKEBOX */ +#endif /* These six spinlocks have fixed location is shmem */ ShmemLock = (SPINLOCK) SHMEMLOCKID; @@ -74,9 +74,9 @@ InitSpinLocks(int init, IPCKey key) SInvalLock = (SPINLOCK) SINVALLOCKID; OidGenLockId = (SPINLOCK) OIDGENLOCKID; -#ifdef MAIN_MEMORY +#ifdef STABLE_MEMORY_STORAGE MMCacheLock = (SPINLOCK) MMCACHELOCKID; -#endif /* MAIN_MEMORY */ +#endif return (TRUE); } @@ -285,10 +285,10 @@ InitSpinLocks(int init, IPCKey key) extern SPINLOCK SInvalLock; extern SPINLOCK OidGenLockId; -#ifdef MAIN_MEMORY +#ifdef STABLE_MEMORY_STORAGE extern SPINLOCK MMCacheLock; -#endif /* MAIN_MEMORY */ +#endif if (!init || key != IPC_PRIVATE) { @@ -313,9 +313,9 @@ InitSpinLocks(int init, IPCKey key) SInvalLock = (SPINLOCK) SINVALLOCKID; OidGenLockId = (SPINLOCK) OIDGENLOCKID; -#ifdef MAIN_MEMORY +#ifdef STABLE_MEMORY_STORAGE MMCacheLock = (SPINLOCK) MMCACHELOCKID; -#endif /* MAIN_MEMORY */ +#endif return (TRUE); } |