*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
CreateSpinlocks(IPCKeyGetSpinLockSemaphoreKey(key));
size = BufferShmemSize() + LockShmemSize();
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
size += MMShmemSize();
-#endif /* MAIN_MEMORY */
+#endif
if (DebugLvl > 1)
{
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
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;
SInvalLock = (SPINLOCK) SINVALLOCKID;
OidGenLockId = (SPINLOCK) OIDGENLOCKID;
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
-#endif /* MAIN_MEMORY */
+#endif
return (TRUE);
}
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)
{
SInvalLock = (SPINLOCK) SINVALLOCKID;
OidGenLockId = (SPINLOCK) OIDGENLOCKID;
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
-#endif /* MAIN_MEMORY */
+#endif
return (TRUE);
}
*
*
* 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
#include "storage/ipc.h"
return (size);
}
-#endif /* MAIN_MEMORY */
+#endif /* STABLE_MEMORY_STORAGE */
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
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
};
/*
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);
*
*
* 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 $
*
*-------------------------------------------------------------------------
*/
static smgrid StorageManager[] = {
{"magnetic disk"},
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
{"main memory"}
-#endif /* MAIN_MEMORY */
+#endif
};
static int NStorageManagers = lengthof(StorageManager);
*
* 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 $
*
*-------------------------------------------------------------------------
*/
* we distribute to other sites.
* ----------------
*/
-#ifdef SEQUOIA
-#define MAIN_MEMORY
+#ifdef NOT_USED
+#define STABLE_MEMORY_STORAGE
#endif
*
* 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
LOCKMGRLOCKID,
SINVALLOCKID,
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
MMCACHELOCKID,
-#endif /* MAIN_MEMORY */
+#endif
PROCSTRUCTLOCKID,
FIRSTFREELOCKID
LOCKMGRLOCKID,
SINVALLOCKID,
-#ifdef MAIN_MEMORY
+#ifdef STABLE_MEMORY_STORAGE
MMCACHELOCKID,
-#endif /* MAIN_MEMORY */
+#endif
PROCSTRUCTLOCKID,
OIDGENLOCKID,