database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Clean up locktable init code per recent gripe from Kurt Roeckx.

Browse Source 
No change in behavior, but old code would have failed to detect
overrun of MAX_LOCKMODES.
This commit is contained in:
Tom Lane 2003-08-17 22:41:12 +00:00
parent c771838106
commit de9c553f6b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/storage/lmgr/lmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.58 2003/08/04 02:40:03 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.59 2003/08/17 22:41:12 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -76,8 +76,10 @@ InitLockTable(int maxBackends)
{ {
int lockmethod; int lockmethod;
/* number of lock modes is lengthof()-1 because of dummy zero */
lockmethod = LockMethodTableInit("LockTable", lockmethod = LockMethodTableInit("LockTable",
LockConflicts, MAX_LOCKMODES - 1, LockConflicts,
lengthof(LockConflicts) - 1,
maxBackends); maxBackends);
LockTableId = lockmethod; LockTableId = lockmethod;

13
src/backend/storage/lmgr/lock.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.126 2003/08/04 02:40:03 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.127 2003/08/17 22:41:12 tgl Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
@ -212,8 +212,8 @@ LockMethodInit(LOCKMETHODTABLE *lockMethodTable,
int i; int i;
lockMethodTable->numLockModes = numModes; lockMethodTable->numLockModes = numModes;
numModes++; /* copies useless zero element as well as the N lockmodes */
for (i = 0; i < numModes; i++, conflictsP++) for (i = 0; i <= numModes; i++, conflictsP++)
lockMethodTable->conflictTab[i] = *conflictsP; lockMethodTable->conflictTab[i] = *conflictsP;
} }
@ -241,11 +241,8 @@ LockMethodTableInit(char *tabName,
max_table_size; max_table_size;
if (numModes >= MAX_LOCKMODES) if (numModes >= MAX_LOCKMODES)
{ elog(ERROR, "too many lock types %d (limit is %d)",
elog(WARNING, "too many lock types %d (limit is %d)", numModes, MAX_LOCKMODES-1);
numModes, MAX_LOCKMODES);
return INVALID_LOCKMETHOD;
}
/* Compute init/max size to request for lock hashtables */ /* Compute init/max size to request for lock hashtables */
max_table_size = NLOCKENTS(maxBackends); max_table_size = NLOCKENTS(maxBackends);