aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/transam/multixact.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/access/transam/multixact.c')
-rw-r--r--src/backend/access/transam/multixact.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index d264d8ad57c..1adaebb6d80 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -42,7 +42,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.7 2005/08/20 01:29:27 ishii Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.8 2005/08/20 23:26:08 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1159,13 +1159,20 @@ AtEOXact_MultiXact(void)
* thus double memory. Also, reserve space for the shared MultiXactState
* struct and the per-backend MultiXactId arrays (two of those, too).
*/
-int
+Size
MultiXactShmemSize(void)
{
+ Size size;
+
#define SHARED_MULTIXACT_STATE_SIZE \
- (sizeof(MultiXactStateData) + sizeof(MultiXactId) * 2 * MaxBackends)
+ add_size(sizeof(MultiXactStateData), \
+ mul_size(sizeof(MultiXactId) * 2, MaxBackends))
+
+ size = SHARED_MULTIXACT_STATE_SIZE;
+ size = add_size(size, SimpleLruShmemSize());
+ size = add_size(size, SimpleLruShmemSize());
- return (SimpleLruShmemSize() * 2 + SHARED_MULTIXACT_STATE_SIZE);
+ return size;
}
void