Fix allocation for locks

ildus · ildus · commit 56dcbf7fc1b5 · 2015-10-20T16:19:40.000+03:00
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -57,21 +57,6 @@ int			max_locks_per_xact; /* set by guc.c */
 #define NLOCKENTS() \
 	mul_size(max_locks_per_xact, add_size(MaxBackends, max_prepared_xacts))
 
-/* Lock names. For monitoring purposes */
-const char *LOCK_NAMES[] =
-{
-	"Relation",
-	"RelationExtend",
-	"Page",
-	"Tuple",
-	"Transaction",
-	"VirtualTransaction",
-	"SpeculativeToken",
-	"Object",
-	"Userlock",
-	"Advisory"
-};
-
 /*
  * Data structures defining the semantics of the standard lock methods.
  *
@@ -119,6 +104,20 @@ static const LOCKMASK LockConflicts[] = {
 
 };
 
+/* Lock names. For monitoring purposes */
+const char *LOCK_NAMES[] =
+{
+	"Relation",
+	"RelationExtend",
+	"Page",
+	"Tuple",
+	"Transaction",
+	"VirtualTransaction",
+	"Object",
+	"Userlock",
+	"Advisory"
+};
+
 /* Names of lock modes, for debug printouts */
 static const char *const lock_mode_names[] =
 {
@@ -3314,6 +3313,9 @@ LockShmemSize(void)
 	max_table_size *= 2;
 	size = add_size(size, hash_estimate_size(max_table_size, sizeof(PROCLOCK)));
 
+	/* Lock Manager LWLock structures */
+	size = add_size(size, LWLockTrancheShmemSize(NUM_LOCK_PARTITIONS));
+
 	/*
 	 * Since NLOCKENTS is only an estimate, add 10% safety margin.
 	 */
