diff options
Diffstat (limited to 'src/backend/storage/lmgr/proc.c')
-rw-r--r-- | src/backend/storage/lmgr/proc.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 90a37332f3a..efb09fb08f2 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.162 2005/08/08 03:11:55 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.163 2005/08/20 23:26:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -91,15 +91,19 @@ static bool CheckStatementTimeout(void); /* * Report shared-memory space needed by InitProcGlobal. */ -int +Size ProcGlobalShmemSize(void) { - int size = 0; - - size += MAXALIGN(sizeof(PROC_HDR)); /* ProcGlobal */ - size += MAXALIGN(NUM_DUMMY_PROCS * sizeof(PGPROC)); /* DummyProcs */ - size += MAXALIGN(MaxBackends * sizeof(PGPROC)); /* MyProcs */ - size += MAXALIGN(sizeof(slock_t)); /* ProcStructLock */ + Size size = 0; + + /* ProcGlobal */ + size = add_size(size, sizeof(PROC_HDR)); + /* DummyProcs */ + size = add_size(size, mul_size(NUM_DUMMY_PROCS, sizeof(PGPROC))); + /* MyProcs */ + size = add_size(size, mul_size(MaxBackends, sizeof(PGPROC))); + /* ProcStructLock */ + size = add_size(size, sizeof(slock_t)); return size; } |