rename MAIN_MEMORY to STABLE_MEMORY_STORAGE
This commit is contained in:
Bruce Momjian
parent
62b124b4ee
commit
cba0c6559a
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.8 1998/05/29 17:00:13 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.9 1998/06/23 15:35:45 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#include "postgres.h"
|
||||
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
|
||||
#include <math.h>
|
||||
#include "storage/ipc.h"
|
||||
|
|
@ -608,4 +608,4 @@ MMShmemSize()
|
|||
return (size);
|
||||
}
|
||||
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif /* STABLE_MEMORY_STORAGE */
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.15 1998/05/29 17:00:14 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.16 1998/06/23 15:35:45 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -56,13 +56,13 @@ static f_smgr smgrsw[] = {
|
|||
mdread, mdwrite, mdflush, mdblindwrt, mdnblocks, mdtruncate,
|
||||
mdcommit, mdabort},
|
||||
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
/* main memory */
|
||||
{mminit, mmshutdown, mmcreate, mmunlink, mmextend, mmopen, mmclose,
|
||||
mmread, mmwrite, mmflush, mmblindwrt, mmnblocks, NULL,
|
||||
mmcommit, mmabort},
|
||||
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -74,9 +74,9 @@ static f_smgr smgrsw[] = {
|
|||
|
||||
static bool smgrwo[] = {
|
||||
false, /* magnetic disk */
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
false, /* main memory */
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif
|
||||
};
|
||||
static int NSmgr = lengthof(smgrsw);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.8 1998/02/26 04:36:17 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.9 1998/06/23 15:35:45 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -32,9 +32,9 @@ typedef struct smgrid
|
|||
|
||||
static smgrid StorageManager[] = {
|
||||
{"magnetic disk"},
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
{"main memory"}
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif
|
||||
};
|
||||
|
||||
static int NStorageManagers = lengthof(StorageManager);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: c.h,v 1.41 1998/06/20 04:34:31 momjian Exp $
|
||||
* $Id: c.h,v 1.42 1998/06/23 15:35:46 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -779,8 +779,8 @@ extern char *form(const char *fmt,...);
|
|||
* we distribute to other sites.
|
||||
* ----------------
|
||||
*/
|
||||
#ifdef SEQUOIA
|
||||
#define MAIN_MEMORY
|
||||
#ifdef NOT_USED
|
||||
#define STABLE_MEMORY_STORAGE
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
*
|
||||
* Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: ipc.h,v 1.25 1998/05/29 17:00:26 momjian Exp $
|
||||
* $Id: ipc.h,v 1.26 1998/06/23 15:35:48 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* This file is very architecture-specific. This stuff should actually
|
||||
|
|
@ -112,9 +112,9 @@ typedef enum _LockId_
|
|||
LOCKMGRLOCKID,
|
||||
SINVALLOCKID,
|
||||
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
MMCACHELOCKID,
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif
|
||||
|
||||
PROCSTRUCTLOCKID,
|
||||
FIRSTFREELOCKID
|
||||
|
|
@ -143,9 +143,9 @@ typedef enum _LockId_
|
|||
LOCKMGRLOCKID,
|
||||
SINVALLOCKID,
|
||||
|
||||
#ifdef MAIN_MEMORY
|
||||
#ifdef STABLE_MEMORY_STORAGE
|
||||
MMCACHELOCKID,
|
||||
#endif /* MAIN_MEMORY */
|
||||
#endif
|
||||
|
||||
PROCSTRUCTLOCKID,
|
||||
OIDGENLOCKID,
|
||||
|
|
|
|||
Loading…
Reference in New Issue