Skip to content

Commit cba0c65

Browse files
bmomjianbmomjian
committed
rename MAIN_MEMORY to STABLE_MEMORY_STORAGE
1 parent 62b124b commit cba0c65

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎src/backend/storage/ipc/ipci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.8 1998/05/29 17:00:12 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.9 1998/06/23 15:35:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -73,9 +73,9 @@ CreateSharedMemoryAndSemaphores(IPCKey key)
7373
CreateSpinlocks(IPCKeyGetSpinLockSemaphoreKey(key));
7474
size = BufferShmemSize() + LockShmemSize();
7575

76-
#ifdef MAIN_MEMORY
76+
#ifdef STABLE_MEMORY_STORAGE
7777
size += MMShmemSize();
78-
#endif /* MAIN_MEMORY */
78+
#endif
7979

8080
if (DebugLvl > 1)
8181
{

‎src/backend/storage/ipc/spin.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.11 1998/06/15 19:29:16 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.12 1998/06/23 15:35:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -60,10 +60,10 @@ InitSpinLocks(int init, IPCKey key)
6060
extern SPINLOCK SInvalLock;
6161
extern SPINLOCK OidGenLockId;
6262

63-
#ifdef MAIN_MEMORY
63+
#ifdef STABLE_MEMORY_STORAGE
6464
extern SPINLOCK MMCacheLock;
6565

66-
#endif /* SONY_JUKEBOX */
66+
#endif
6767

6868
/* These six spinlocks have fixed location is shmem */
6969
ShmemLock = (SPINLOCK) SHMEMLOCKID;
@@ -74,9 +74,9 @@ InitSpinLocks(int init, IPCKey key)
7474
SInvalLock = (SPINLOCK) SINVALLOCKID;
7575
OidGenLockId = (SPINLOCK) OIDGENLOCKID;
7676

77-
#ifdef MAIN_MEMORY
77+
#ifdef STABLE_MEMORY_STORAGE
7878
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
79-
#endif /* MAIN_MEMORY */
79+
#endif
8080

8181
return (TRUE);
8282
}
@@ -285,10 +285,10 @@ InitSpinLocks(int init, IPCKey key)
285285
extern SPINLOCK SInvalLock;
286286
extern SPINLOCK OidGenLockId;
287287

288-
#ifdef MAIN_MEMORY
288+
#ifdef STABLE_MEMORY_STORAGE
289289
extern SPINLOCK MMCacheLock;
290290

291-
#endif /* MAIN_MEMORY */
291+
#endif
292292

293293
if (!init || key != IPC_PRIVATE)
294294
{
@@ -313,9 +313,9 @@ InitSpinLocks(int init, IPCKey key)
313313
SInvalLock = (SPINLOCK) SINVALLOCKID;
314314
OidGenLockId = (SPINLOCK) OIDGENLOCKID;
315315

316-
#ifdef MAIN_MEMORY
316+
#ifdef STABLE_MEMORY_STORAGE
317317
MMCacheLock = (SPINLOCK) MMCACHELOCKID;
318-
#endif /* MAIN_MEMORY */
318+
#endif
319319

320320
return (TRUE);
321321
}

‎src/backend/storage/smgr/mm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.8 1998/05/29 17:00:13 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.9 1998/06/23 15:35:45 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717
#include "postgres.h"
1818

19-
#ifdef MAIN_MEMORY
19+
#ifdef STABLE_MEMORY_STORAGE
2020

2121
#include <math.h>
2222
#include "storage/ipc.h"
@@ -608,4 +608,4 @@ MMShmemSize()
608608
return (size);
609609
}
610610

611-
#endif /* MAIN_MEMORY */
611+
#endif /* STABLE_MEMORY_STORAGE */

‎src/backend/storage/smgr/smgr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.15 1998/05/29 17:00:14 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.16 1998/06/23 15:35:45 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -56,13 +56,13 @@ static f_smgr smgrsw[] = {
5656
mdread, mdwrite, mdflush, mdblindwrt, mdnblocks, mdtruncate,
5757
mdcommit, mdabort},
5858

59-
#ifdef MAIN_MEMORY
59+
#ifdef STABLE_MEMORY_STORAGE
6060
/* main memory */
6161
{mminit, mmshutdown, mmcreate, mmunlink, mmextend, mmopen, mmclose,
6262
mmread, mmwrite, mmflush, mmblindwrt, mmnblocks, NULL,
6363
mmcommit, mmabort},
6464

65-
#endif /* MAIN_MEMORY */
65+
#endif
6666
};
6767

6868
/*
@@ -74,9 +74,9 @@ static f_smgr smgrsw[] = {
7474

7575
static bool smgrwo[] = {
7676
false, /* magnetic disk */
77-
#ifdef MAIN_MEMORY
77+
#ifdef STABLE_MEMORY_STORAGE
7878
false, /* main memory */
79-
#endif /* MAIN_MEMORY */
79+
#endif
8080
};
8181
static int NSmgr = lengthof(smgrsw);
8282

‎src/backend/storage/smgr/smgrtype.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.8 1998/02/26 04:36:17 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.9 1998/06/23 15:35:45 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -32,9 +32,9 @@ typedef struct smgrid
3232

3333
static smgrid StorageManager[] = {
3434
{"magnetic disk"},
35-
#ifdef MAIN_MEMORY
35+
#ifdef STABLE_MEMORY_STORAGE
3636
{"main memory"}
37-
#endif /* MAIN_MEMORY */
37+
#endif
3838
};
3939

4040
static int NStorageManagers = lengthof(StorageManager);

‎src/include/c.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: c.h,v 1.41 1998/06/20 04:34:31 momjian Exp $
10+
* $Id: c.h,v 1.42 1998/06/23 15:35:46 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -779,8 +779,8 @@ extern char *form(const char *fmt,...);
779779
* we distribute to other sites.
780780
* ----------------
781781
*/
782-
#ifdef SEQUOIA
783-
#define MAIN_MEMORY
782+
#ifdef NOT_USED
783+
#define STABLE_MEMORY_STORAGE
784784
#endif
785785

786786

‎src/include/storage/ipc.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: ipc.h,v 1.25 1998/05/29 17:00:26 momjian Exp $
9+
* $Id: ipc.h,v 1.26 1998/06/23 15:35:48 momjian Exp $
1010
*
1111
* NOTES
1212
* This file is very architecture-specific. This stuff should actually
@@ -112,9 +112,9 @@ typedef enum _LockId_
112112
LOCKMGRLOCKID,
113113
SINVALLOCKID,
114114

115-
#ifdef MAIN_MEMORY
115+
#ifdef STABLE_MEMORY_STORAGE
116116
MMCACHELOCKID,
117-
#endif /* MAIN_MEMORY */
117+
#endif
118118

119119
PROCSTRUCTLOCKID,
120120
FIRSTFREELOCKID
@@ -143,9 +143,9 @@ typedef enum _LockId_
143143
LOCKMGRLOCKID,
144144
SINVALLOCKID,
145145

146-
#ifdef MAIN_MEMORY
146+
#ifdef STABLE_MEMORY_STORAGE
147147
MMCACHELOCKID,
148-
#endif /* MAIN_MEMORY */
148+
#endif
149149

150150
PROCSTRUCTLOCKID,
151151
OIDGENLOCKID,

0 commit comments

Comments
 (0)