database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Disable query cancel during HandleDeadLock().

Browse Source
This commit is contained in:
Hiroshi Inoue
2001-01-09 09:38:57 +00:00
parent 4b59366e57
commit 7edff1618e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/storage/lmgr/proc.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.89 2000/12/22 00:51:54 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.90 2001/01/09 09:38:57 inoue Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -48,7 +48,7 @@
* This is so that we can support more backends. (system-wide semaphore * This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95 * sets run out pretty fast.) -ay 4/95
* *
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.89 2000/12/22 00:51:54 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.90 2001/01/09 09:38:57 inoue Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@@ -864,7 +864,9 @@ HandleDeadLock(SIGNAL_ARGS)
{ {
int save_errno = errno; int save_errno = errno;
LOCK *mywaitlock; LOCK *mywaitlock;
bool isWaitingForLock = lockWaiting; /* save waiting status */
SetWaitingForLock(false); /* disable query cancel during this fuction */
LockLockTable(); LockLockTable();
/* --------------------- /* ---------------------
@@ -884,6 +886,7 @@ HandleDeadLock(SIGNAL_ARGS)
{ {
UnlockLockTable(); UnlockLockTable();
errno = save_errno; errno = save_errno;
SetWaitingForLock(isWaitingForLock); /* restore waiting status */
return; return;
} }
@@ -897,6 +900,7 @@ HandleDeadLock(SIGNAL_ARGS)
/* No deadlock, so keep waiting */ /* No deadlock, so keep waiting */
UnlockLockTable(); UnlockLockTable();
errno = save_errno; errno = save_errno;
SetWaitingForLock(isWaitingForLock); /* restore waiting status */
return; return;
} }
@@ -911,7 +915,7 @@ HandleDeadLock(SIGNAL_ARGS)
SHMQueueElemInit(&(MyProc->links)); SHMQueueElemInit(&(MyProc->links));
MyProc->waitLock = NULL; MyProc->waitLock = NULL;
MyProc->waitHolder = NULL; MyProc->waitHolder = NULL;
lockWaiting = false; isWaitingForLock = false; /* wait for lock no longer */
/* ------------------ /* ------------------
* Unlock my semaphore so that the interrupted ProcSleep() call can finish. * Unlock my semaphore so that the interrupted ProcSleep() call can finish.