diff options
| -rw-r--r-- | src/backend/storage/lmgr/deadlock.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index ca892b2cc0a..8aeef9c36d6 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.14 2002/10/03 19:17:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.15 2002/11/01 00:40:23 tgl Exp $ * * Interface: * @@ -172,6 +172,10 @@ InitDeadLockChecking(void) * only look at regular locks. * * We must have already locked the master lock before being called. + * NOTE: although the lockmethod structure appears to allow each lock + * table to have a different masterLock, all locks that can block had + * better use the same LWLock, else this code will not be adequately + * interlocked! */ bool DeadLockCheck(PGPROC *proc) diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 63531bbf3a9..c7065637590 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.117 2002/10/31 21:34:16 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.118 2002/11/01 00:40:23 tgl Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -255,7 +255,7 @@ LockMethodTableInit(char *tabName, /* This is just temp space in this routine, so palloc is OK. */ shmemName = (char *) palloc(strlen(tabName) + 32); - /* each lock table has a non-shared, permanent header */ + /* each lock table has a header in shared memory */ sprintf(shmemName, "%s (lock method table)", tabName); lockMethodTable = (LOCKMETHODTABLE *) ShmemInitStruct(shmemName, sizeof(LOCKMETHODTABLE), &found); |