diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-05-13 15:55:45 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-05-13 15:55:45 +0000 |
| commit | 564842a61779c91b7b5c92dceba5361c114cb37c (patch) | |
| tree | 8117f5b1499016e6905441b6a4593ba631976c6b /src/backend/storage/lmgr/proc.c | |
| parent | 9bbc1657a14e3efacab8a7a930db7aec150c0665 (diff) | |
| download | postgresql-564842a61779c91b7b5c92dceba5361c114cb37c.tar.gz postgresql-564842a61779c91b7b5c92dceba5361c114cb37c.zip | |
Hi, Bruce!
These are my last changes to lmgr fixing deadlock handling.
Please apply them to cvs...
Vadim
Diffstat (limited to 'src/backend/storage/lmgr/proc.c')
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index b80d32e1b44..4eb97b8a6a8 100644 --- 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.54 1999/05/07 01:23:04 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.55 1999/05/13 15:55:44 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.54 1999/05/07 01:23:04 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.55 1999/05/13 15:55:44 momjian Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -78,7 +78,6 @@ #include "utils/trace.h" static void HandleDeadLock(int sig); -static PROC *ProcWakeup(PROC *proc, int errType); static void ProcFreeAllSemaphores(void); #define DeadlockCheckTimer pg_options[OPT_DEADLOCKTIMEOUT] @@ -640,7 +639,7 @@ rt:; * remove the process from the wait queue and set its links invalid. * RETURN: the next process in the wait queue. */ -static PROC * +PROC * ProcWakeup(PROC *proc, int errType) { PROC *retProc; @@ -806,10 +805,10 @@ HandleDeadLock(int sig) DumpAllLocks(); #endif - if (!DeadLockCheck(&(MyProc->lockQueue), MyProc->waitLock, true)) + MyProc->errType = STATUS_NOT_FOUND; + if (!DeadLockCheck(MyProc, MyProc->waitLock)) { UnlockLockTable(); - MyProc->errType = STATUS_NOT_FOUND; return; } |