Fix some bogus comments.

tglsfdc · tglsfdc · commit 643dfb783d24 · 2002-11-01T00:40:23.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.14 2002/10/03 19:17:55 tgl Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.15 2002/11/01 00:40:23 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`* Interface:`
`18`	`18`	`*`
`@@ -172,6 +172,10 @@ InitDeadLockChecking(void)`
`172`	`172`	`* only look at regular locks.`
`173`	`173`	`*`
`174`	`174`	`* We must have already locked the master lock before being called.`
	`175`	`+ * NOTE: although the lockmethod structure appears to allow each lock`
	`176`	`+ * table to have a different masterLock, all locks that can block had`
	`177`	`+ * better use the same LWLock, else this code will not be adequately`
	`178`	`+ * interlocked!`
`175`	`179`	`*/`
`176`	`180`	`bool`
`177`	`181`	`DeadLockCheck(PGPROC *proc)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.117 2002/10/31 21:34:16 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.118 2002/11/01 00:40:23 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* Outside modules can create a lock table and acquire/release`
`@@ -255,7 +255,7 @@ LockMethodTableInit(char *tabName,`
`255`	`255`	`/* This is just temp space in this routine, so palloc is OK. */`
`256`	`256`	`shmemName = (char *) palloc(strlen(tabName) + 32);`
`257`	`257`
`258`		`- /* each lock table has a non-shared, permanent header */`
	`258`	`+ /* each lock table has a header in shared memory */`
`259`	`259`	`sprintf(shmemName, "%s (lock method table)", tabName);`
`260`	`260`	`lockMethodTable = (LOCKMETHODTABLE *)`
`261`	`261`	`ShmemInitStruct(shmemName, sizeof(LOCKMETHODTABLE), &found);`