diff options
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/ipc/ipci.c | 5 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lwlock.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 5212bc1bbe3..975d5f131d7 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.74 2004/12/31 22:00:56 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.75 2005/04/28 21:47:15 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/clog.h" +#include "access/multixact.h" #include "access/subtrans.h" #include "access/xlog.h" #include "miscadmin.h" @@ -75,6 +76,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, size += XLOGShmemSize(); size += CLOGShmemSize(); size += SUBTRANSShmemSize(); + size += MultiXactShmemSize(); size += LWLockShmemSize(); size += SInvalShmemSize(maxBackends); size += FreeSpaceShmemSize(); @@ -140,6 +142,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, XLOGShmemInit(); CLOGShmemInit(); SUBTRANSShmemInit(); + MultiXactShmemInit(); InitBufferPool(); /* diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index f75ccc869ff..8b7e6f94516 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.27 2005/04/08 14:18:35 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.28 2005/04/28 21:47:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -114,6 +114,12 @@ NumLWLocks(void) /* subtrans.c needs one per SubTrans buffer */ numLocks += NUM_SLRU_BUFFERS; + /* + * multixact.c needs one per MultiXact buffer, but there are + * two SLRU areas for MultiXact + */ + numLocks += 2 * NUM_SLRU_BUFFERS; + /* Perhaps create a few more for use by user-defined modules? */ return numLocks; |