Fix a variety of locking problems like newer lock waiters getting

bmomjian · bmomjian · commit 0e8ac82c6374 · 1998-01-23T22:16:48.000Z
lock before older waiters, and having readlock people not share
locks if a writer is waiting for a lock, and waiting writers not
getting priority over waiting readers.
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.19 1998/01/23 06:01:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.20 1998/01/23 22:16:46 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -708,6 +708,20 @@ LockResolveConflicts(LOCKTAB *ltable,
 		result->nHolding = 0;
 	}
 
+	{
+		/* ------------------------
+		 * If someone with a greater priority is waiting for the lock,
+		 * do not continue and share the lock, even if we can.  bjm
+		 * ------------------------
+		 */
+		int				myprio = ltable->ctl->prio[lockt];
+		PROC_QUEUE		*waitQueue = &(lock->waitProcs);
+		PROC			*topproc = (PROC *) MAKE_PTR(waitQueue->links.prev);
+
+		if (waitQueue->size && topproc->prio > myprio)
+			return STATUS_FOUND;
+	}
+
 	/* ----------------------------
 	 * first check for global conflicts: If no locks conflict
 	 * with mine, then I get the lock.
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.26 1998/01/23 06:01:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.27 1998/01/23 22:16:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.26 1998/01/23 06:01:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.27 1998/01/23 22:16:48 momjian Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -469,7 +469,7 @@ ProcSleep(PROC_QUEUE *queue,
 	proc = (PROC *) MAKE_PTR(queue->links.prev);
 	for (i = 0; i < queue->size; i++)
 	{
-		if (proc->prio < prio)
+		if (proc->prio >= prio)
 			proc = (PROC *) MAKE_PTR(proc->links.prev);
 		else
 			break;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.26 1998/01/23 06:01:05 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.27 1998/01/23 22:16:48 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -46,7 +46,7 @@`
`46`	`46`	`* This is so that we can support more backends. (system-wide semaphore`
`47`	`47`	`* sets run out pretty fast.) -ay 4/95`
`48`	`48`	`*`
`49`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.26 1998/01/23 06:01:05 momjian Exp $`
	`49`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.27 1998/01/23 22:16:48 momjian Exp $`
`50`	`50`	`*/`
`51`	`51`	`#include <sys/time.h>`
`52`	`52`	`#include <unistd.h>`
`@@ -469,7 +469,7 @@ ProcSleep(PROC_QUEUE *queue,`
`469`	`469`	`proc = (PROC *) MAKE_PTR(queue->links.prev);`
`470`	`470`	`for (i = 0; i < queue->size; i++)`
`471`	`471`	`{`
`472`		`- if (proc->prio < prio)`
	`472`	`+ if (proc->prio >= prio)`
`473`	`473`	`proc = (PROC *) MAKE_PTR(proc->links.prev);`
`474`	`474`	`else`
`475`	`475`	`break;`