need child specific release that doesn't trigger cv
This commit is contained in:
parent
3492615c6a
commit
b5ab1d64e2
@ -859,6 +859,11 @@ void aeReleaseForkLock()
|
|||||||
g_forkLock.downgradeWrite();
|
g_forkLock.downgradeWrite();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void aeReleaseForkLockChild()
|
||||||
|
{
|
||||||
|
g_forkLock.downgradeWriteChild();
|
||||||
|
}
|
||||||
|
|
||||||
int aeThreadOwnsLock()
|
int aeThreadOwnsLock()
|
||||||
{
|
{
|
||||||
return fOwnLockOverride || g_lock.fOwnLock();
|
return fOwnLockOverride || g_lock.fOwnLock();
|
||||||
|
1
src/ae.h
1
src/ae.h
@ -171,6 +171,7 @@ int aeTryAcquireLock(int fWeak);
|
|||||||
void aeThreadOffline();
|
void aeThreadOffline();
|
||||||
void aeReleaseLock();
|
void aeReleaseLock();
|
||||||
void aeReleaseForkLock();
|
void aeReleaseForkLock();
|
||||||
|
void aeReleaseForkLockChild();
|
||||||
int aeThreadOwnsLock();
|
int aeThreadOwnsLock();
|
||||||
void aeSetThreadOwnsLockOverride(int fOverride);
|
void aeSetThreadOwnsLockOverride(int fOverride);
|
||||||
int aeLockContested(int threshold);
|
int aeLockContested(int threshold);
|
||||||
|
@ -77,11 +77,25 @@ public:
|
|||||||
m_cv.notify_all();
|
m_cv.notify_all();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void releaseWriteChild(bool exclusive = true) {
|
||||||
|
std::unique_lock<fastlock> rm(m_readLock);
|
||||||
|
serverAssert(m_writeCount > 0);
|
||||||
|
if (exclusive)
|
||||||
|
m_writeLock.unlock();
|
||||||
|
m_writeCount--;
|
||||||
|
m_writeWaiting = false;
|
||||||
|
}
|
||||||
|
|
||||||
void downgradeWrite(bool exclusive = true) {
|
void downgradeWrite(bool exclusive = true) {
|
||||||
releaseWrite(exclusive);
|
releaseWrite(exclusive);
|
||||||
acquireRead();
|
acquireRead();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void downgradeWriteChild(bool exclusive = true) {
|
||||||
|
releaseWriteChild(exclusive);
|
||||||
|
acquireRead();
|
||||||
|
}
|
||||||
|
|
||||||
bool hasReader() {
|
bool hasReader() {
|
||||||
return m_readCount > 0;
|
return m_readCount > 0;
|
||||||
}
|
}
|
||||||
|
@ -6888,6 +6888,7 @@ int redisFork(int purpose) {
|
|||||||
latencyAddSampleIfNeeded("fork-lock",(ustime()-startWriteLock)/1000);
|
latencyAddSampleIfNeeded("fork-lock",(ustime()-startWriteLock)/1000);
|
||||||
if ((childpid = fork()) == 0) {
|
if ((childpid = fork()) == 0) {
|
||||||
/* Child */
|
/* Child */
|
||||||
|
aeReleaseForkLockChild();
|
||||||
g_pserver->in_fork_child = purpose;
|
g_pserver->in_fork_child = purpose;
|
||||||
setOOMScoreAdj(CONFIG_OOM_BGCHILD);
|
setOOMScoreAdj(CONFIG_OOM_BGCHILD);
|
||||||
setupChildSignalHandlers();
|
setupChildSignalHandlers();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user