Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5ffb7c7

Browse files
committed
De-pessimize ConditionVariableCancelSleep().
Commit b91dd9d was concerned with a theoretical problem with our non-atomic condition variable operations. If you stop sleeping, and then cancel the sleep in a separate step, you might be signaled in between, and that could be lost. That doesn't matter for callers of ConditionVariableBroadcast(), but callers of ConditionVariableSignal() might be upset if a signal went missing like this. Commit bc971f4 interacted badly with that logic, because it doesn't use ConditionVariableSleep(), which would normally put us back in the wait list. ConditionVariableCancelSleep() would be confused and think we'd received an extra signal, and try to forward it to another backend, resulting in wakeup storms. New idea: ConditionVariableCancelSleep() can just return true if we've been signaled. Hypothetical users of ConditionVariableSignal() would then still have a way to deal with rare lost signals if they are concerned about that problem. Back-patch to 16, where bc971f4 arrived. Reported-by: Tomas Vondra <tomas.vondra@enterprisedb.com> Reviewed-by: Andres Freund <andres@anarazel.de> Discussion: https://postgr.es/m/2840876b-4cfe-240f-0a7e-29ffd66711e7%40enterprisedb.com
1 parent 82a4eda commit 5ffb7c7

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/backend/storage/lmgr/condition_variable.c

+6-10
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,17 @@ ConditionVariableTimedSleep(ConditionVariable *cv, long timeout,
223223
*
224224
* Do nothing if nothing is pending; this allows this function to be called
225225
* during transaction abort to clean up any unfinished CV sleep.
226+
*
227+
* Return true if we've been signaled.
226228
*/
227-
void
229+
bool
228230
ConditionVariableCancelSleep(void)
229231
{
230232
ConditionVariable *cv = cv_sleep_target;
231233
bool signaled = false;
232234

233235
if (cv == NULL)
234-
return;
236+
return false;
235237

236238
SpinLockAcquire(&cv->mutex);
237239
if (proclist_contains(&cv->wakeup, MyProc->pgprocno, cvWaitLink))
@@ -240,15 +242,9 @@ ConditionVariableCancelSleep(void)
240242
signaled = true;
241243
SpinLockRelease(&cv->mutex);
242244

243-
/*
244-
* If we've received a signal, pass it on to another waiting process, if
245-
* there is one. Otherwise a call to ConditionVariableSignal() might get
246-
* lost, despite there being another process ready to handle it.
247-
*/
248-
if (signaled)
249-
ConditionVariableSignal(cv);
250-
251245
cv_sleep_target = NULL;
246+
247+
return signaled;
252248
}
253249

254250
/*

src/include/storage/condition_variable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern void ConditionVariableInit(ConditionVariable *cv);
5656
extern void ConditionVariableSleep(ConditionVariable *cv, uint32 wait_event_info);
5757
extern bool ConditionVariableTimedSleep(ConditionVariable *cv, long timeout,
5858
uint32 wait_event_info);
59-
extern void ConditionVariableCancelSleep(void);
59+
extern bool ConditionVariableCancelSleep(void);
6060

6161
/*
6262
* Optionally, ConditionVariablePrepareToSleep can be called before entering

0 commit comments

Comments
 (0)