diff options
Diffstat (limited to 'src/include/storage/proc.h')
| -rw-r--r-- | src/include/storage/proc.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 952f50553ca..53b677858fd 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.20 1999/02/19 07:10:47 tgl Exp $ + * $Id: proc.h,v 1.21 1999/05/07 01:23:07 vadim Exp $ * *------------------------------------------------------------------------- */ @@ -48,8 +48,9 @@ typedef struct proc * were starting our xact: vacuum must not * remove tuples deleted by xid >= xmin ! */ - LOCK *waitLock; /* Lock we're sleeping on */ - int token; /* info for proc wakeup routines */ + LOCK *waitLock; /* Lock we're sleeping on ... */ + int token; /* type of lock we sleeping for */ + int holdLock; /* while holding these locks */ int pid; /* This procs process id */ short sLocks[MAX_SPINS]; /* Spin lock stats */ SHM_QUEUE lockQueue; /* locks associated with current @@ -116,8 +117,8 @@ extern bool ProcRemove(int pid); /* make static in storage/lmgr/proc.c -- jolly */ extern void ProcQueueInit(PROC_QUEUE *queue); -extern int ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token, - int prio, LOCK *lock, TransactionId xid); +extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL *lockctl, int token, + LOCK *lock); extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock); extern void ProcAddLock(SHM_QUEUE *elem); |