mirror of
https://github.com/postgres/postgres.git
synced 2025-07-29 00:03:13 -04:00
Compare commits
2 Commits
475b3ea3c0
...
dc9d424cf0
Author | SHA1 | Date | |
---|---|---|---|
|
dc9d424cf0 | ||
|
a6463d287b |
@ -484,7 +484,7 @@ MarkAsPreparingGuts(GlobalTransaction gxact, TransactionId xid, const char *gid,
|
||||
proc->roleId = owner;
|
||||
proc->tempNamespaceId = InvalidOid;
|
||||
proc->isBackgroundWorker = false;
|
||||
proc->lwWaiting = false;
|
||||
proc->lwWaiting = LW_WS_NOT_WAITING;
|
||||
proc->lwWaitMode = 0;
|
||||
proc->waitLock = NULL;
|
||||
proc->waitProcLock = NULL;
|
||||
|
@ -290,6 +290,7 @@ pgwin32_socket(int af, int type, int protocol)
|
||||
if (ioctlsocket(s, FIONBIO, &on))
|
||||
{
|
||||
TranslateSocketError();
|
||||
closesocket(s);
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
errno = 0;
|
||||
|
@ -998,6 +998,15 @@ LWLockWakeup(LWLock *lock)
|
||||
wokeup_somebody = true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Signal that the process isn't on the wait list anymore. This allows
|
||||
* LWLockDequeueSelf() to remove itself of the waitlist with a
|
||||
* proclist_delete(), rather than having to check if it has been
|
||||
* removed from the list.
|
||||
*/
|
||||
Assert(waiter->lwWaiting == LW_WS_WAITING);
|
||||
waiter->lwWaiting = LW_WS_PENDING_WAKEUP;
|
||||
|
||||
/*
|
||||
* Once we've woken up an exclusive lock, there's no point in waking
|
||||
* up anybody else.
|
||||
@ -1055,7 +1064,7 @@ LWLockWakeup(LWLock *lock)
|
||||
* another lock.
|
||||
*/
|
||||
pg_write_barrier();
|
||||
waiter->lwWaiting = false;
|
||||
waiter->lwWaiting = LW_WS_NOT_WAITING;
|
||||
PGSemaphoreUnlock(waiter->sem);
|
||||
}
|
||||
}
|
||||
@ -1076,7 +1085,7 @@ LWLockQueueSelf(LWLock *lock, LWLockMode mode)
|
||||
if (MyProc == NULL)
|
||||
elog(PANIC, "cannot wait without a PGPROC structure");
|
||||
|
||||
if (MyProc->lwWaiting)
|
||||
if (MyProc->lwWaiting != LW_WS_NOT_WAITING)
|
||||
elog(PANIC, "queueing for lock while waiting on another one");
|
||||
|
||||
LWLockWaitListLock(lock);
|
||||
@ -1084,7 +1093,7 @@ LWLockQueueSelf(LWLock *lock, LWLockMode mode)
|
||||
/* setting the flag is protected by the spinlock */
|
||||
pg_atomic_fetch_or_u32(&lock->state, LW_FLAG_HAS_WAITERS);
|
||||
|
||||
MyProc->lwWaiting = true;
|
||||
MyProc->lwWaiting = LW_WS_WAITING;
|
||||
MyProc->lwWaitMode = mode;
|
||||
|
||||
/* LW_WAIT_UNTIL_FREE waiters are always at the front of the queue */
|
||||
@ -1112,8 +1121,7 @@ LWLockQueueSelf(LWLock *lock, LWLockMode mode)
|
||||
static void
|
||||
LWLockDequeueSelf(LWLock *lock)
|
||||
{
|
||||
bool found = false;
|
||||
proclist_mutable_iter iter;
|
||||
bool on_waitlist;
|
||||
|
||||
#ifdef LWLOCK_STATS
|
||||
lwlock_stats *lwstats;
|
||||
@ -1126,18 +1134,13 @@ LWLockDequeueSelf(LWLock *lock)
|
||||
LWLockWaitListLock(lock);
|
||||
|
||||
/*
|
||||
* Can't just remove ourselves from the list, but we need to iterate over
|
||||
* all entries as somebody else could have dequeued us.
|
||||
* Remove ourselves from the waitlist, unless we've already been
|
||||
* removed. The removal happens with the wait list lock held, so there's
|
||||
* no race in this check.
|
||||
*/
|
||||
proclist_foreach_modify(iter, &lock->waiters, lwWaitLink)
|
||||
{
|
||||
if (iter.cur == MyProc->pgprocno)
|
||||
{
|
||||
found = true;
|
||||
proclist_delete(&lock->waiters, iter.cur, lwWaitLink);
|
||||
break;
|
||||
}
|
||||
}
|
||||
on_waitlist = MyProc->lwWaiting == LW_WS_WAITING;
|
||||
if (on_waitlist)
|
||||
proclist_delete(&lock->waiters, MyProc->pgprocno, lwWaitLink);
|
||||
|
||||
if (proclist_is_empty(&lock->waiters) &&
|
||||
(pg_atomic_read_u32(&lock->state) & LW_FLAG_HAS_WAITERS) != 0)
|
||||
@ -1149,8 +1152,8 @@ LWLockDequeueSelf(LWLock *lock)
|
||||
LWLockWaitListUnlock(lock);
|
||||
|
||||
/* clear waiting state again, nice for debugging */
|
||||
if (found)
|
||||
MyProc->lwWaiting = false;
|
||||
if (on_waitlist)
|
||||
MyProc->lwWaiting = LW_WS_NOT_WAITING;
|
||||
else
|
||||
{
|
||||
int extraWaits = 0;
|
||||
@ -1174,7 +1177,7 @@ LWLockDequeueSelf(LWLock *lock)
|
||||
for (;;)
|
||||
{
|
||||
PGSemaphoreLock(MyProc->sem);
|
||||
if (!MyProc->lwWaiting)
|
||||
if (MyProc->lwWaiting == LW_WS_NOT_WAITING)
|
||||
break;
|
||||
extraWaits++;
|
||||
}
|
||||
@ -1325,7 +1328,7 @@ LWLockAcquire(LWLock *lock, LWLockMode mode)
|
||||
for (;;)
|
||||
{
|
||||
PGSemaphoreLock(proc->sem);
|
||||
if (!proc->lwWaiting)
|
||||
if (proc->lwWaiting == LW_WS_NOT_WAITING)
|
||||
break;
|
||||
extraWaits++;
|
||||
}
|
||||
@ -1490,7 +1493,7 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode)
|
||||
for (;;)
|
||||
{
|
||||
PGSemaphoreLock(proc->sem);
|
||||
if (!proc->lwWaiting)
|
||||
if (proc->lwWaiting == LW_WS_NOT_WAITING)
|
||||
break;
|
||||
extraWaits++;
|
||||
}
|
||||
@ -1706,7 +1709,7 @@ LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval)
|
||||
for (;;)
|
||||
{
|
||||
PGSemaphoreLock(proc->sem);
|
||||
if (!proc->lwWaiting)
|
||||
if (proc->lwWaiting == LW_WS_NOT_WAITING)
|
||||
break;
|
||||
extraWaits++;
|
||||
}
|
||||
@ -1787,6 +1790,10 @@ LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 val)
|
||||
|
||||
proclist_delete(&lock->waiters, iter.cur, lwWaitLink);
|
||||
proclist_push_tail(&wakeup, iter.cur, lwWaitLink);
|
||||
|
||||
/* see LWLockWakeup() */
|
||||
Assert(waiter->lwWaiting == LW_WS_WAITING);
|
||||
waiter->lwWaiting = LW_WS_PENDING_WAKEUP;
|
||||
}
|
||||
|
||||
/* We are done updating shared state of the lock itself. */
|
||||
@ -1802,7 +1809,7 @@ LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 val)
|
||||
proclist_delete(&wakeup, iter.cur, lwWaitLink);
|
||||
/* check comment in LWLockWakeup() about this barrier */
|
||||
pg_write_barrier();
|
||||
waiter->lwWaiting = false;
|
||||
waiter->lwWaiting = LW_WS_NOT_WAITING;
|
||||
PGSemaphoreUnlock(waiter->sem);
|
||||
}
|
||||
}
|
||||
|
@ -402,7 +402,7 @@ InitProcess(void)
|
||||
/* NB -- autovac launcher intentionally does not set IS_AUTOVACUUM */
|
||||
if (IsAutoVacuumWorkerProcess())
|
||||
MyPgXact->vacuumFlags |= PROC_IS_AUTOVACUUM;
|
||||
MyProc->lwWaiting = false;
|
||||
MyProc->lwWaiting = LW_WS_NOT_WAITING;
|
||||
MyProc->lwWaitMode = 0;
|
||||
MyProc->waitLock = NULL;
|
||||
MyProc->waitProcLock = NULL;
|
||||
@ -582,7 +582,7 @@ InitAuxiliaryProcess(void)
|
||||
MyProc->delayChkpt = false;
|
||||
MyProc->delayChkptEnd = false;
|
||||
MyPgXact->vacuumFlags = 0;
|
||||
MyProc->lwWaiting = false;
|
||||
MyProc->lwWaiting = LW_WS_NOT_WAITING;
|
||||
MyProc->lwWaitMode = 0;
|
||||
MyProc->waitLock = NULL;
|
||||
MyProc->waitProcLock = NULL;
|
||||
|
@ -24,6 +24,14 @@
|
||||
|
||||
struct PGPROC;
|
||||
|
||||
/* what state of the wait process is a backend in */
|
||||
typedef enum LWLockWaitState
|
||||
{
|
||||
LW_WS_NOT_WAITING, /* not currently waiting / woken up */
|
||||
LW_WS_WAITING, /* currently waiting */
|
||||
LW_WS_PENDING_WAKEUP /* removed from waitlist, but not yet signalled */
|
||||
} LWLockWaitState;
|
||||
|
||||
/*
|
||||
* Code outside of lwlock.c should not manipulate the contents of this
|
||||
* structure directly, but we have to declare it here to allow LWLocks to be
|
||||
|
@ -140,7 +140,7 @@ struct PGPROC
|
||||
bool recoveryConflictPending;
|
||||
|
||||
/* Info about LWLock the process is currently waiting for, if any. */
|
||||
bool lwWaiting; /* true if waiting for an LW lock */
|
||||
uint8 lwWaiting; /* see LWLockWaitState */
|
||||
uint8 lwWaitMode; /* lwlock mode being waited for */
|
||||
proclist_node lwWaitLink; /* position in LW lock wait list */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user