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/include | |
| parent | 9bbc1657a14e3efacab8a7a930db7aec150c0665 (diff) | |
Hi, Bruce!
These are my last changes to lmgr fixing deadlock handling.
Please apply them to cvs...
Vadim
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/storage/lock.h | 5 | ||||
| -rw-r--r-- | src/include/storage/proc.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 387f164247c..ab084eb94fd 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.25 1999/05/07 01:23:07 vadim Exp $ + * $Id: lock.h,v 1.26 1999/05/13 15:55:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -249,8 +249,7 @@ extern void GrantLock(LOCK *lock, LOCKMODE lockmode); extern bool LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue); extern int LockShmemSize(int maxBackends); extern bool LockingDisabled(void); -extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, - bool skip_check); +extern bool DeadLockCheck(void *proc, LOCK *findlock); #ifdef DEADLOCK_DEBUG extern void DumpLocks(void); diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 53b677858fd..3dcf1e281b5 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.21 1999/05/07 01:23:07 vadim Exp $ + * $Id: proc.h,v 1.22 1999/05/13 15:55:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,6 +119,7 @@ extern bool ProcRemove(int pid); extern void ProcQueueInit(PROC_QUEUE *queue); extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL *lockctl, int token, LOCK *lock); +extern PROC *ProcWakeup(PROC *proc, int errType); extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock); extern void ProcAddLock(SHM_QUEUE *elem); |