gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid excess locking, seeing up to 8% performance improvements

Browse Source 
Former-commit-id: 69a74a567bd381a84e71f954d4cb35eb878f6d3c
This commit is contained in:
John Sully 2020-10-12 05:50:58 +00:00
parent 6de6515bfc
commit 6496ea5145
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/server.cpp
View File

@ -2223,15 +2223,19 @@ void processClients();
void beforeSleep(struct aeEventLoop *eventLoop) { void beforeSleep(struct aeEventLoop *eventLoop) {
UNUSED(eventLoop); UNUSED(eventLoop);
int iel = ielFromEventLoop(eventLoop); int iel = ielFromEventLoop(eventLoop);
aeAcquireLock();
processClients(); processClients();
/* Handle precise timeouts of blocked clients. */ /* Handle precise timeouts of blocked clients. */
handleBlockedClientsTimeout(); handleBlockedClientsTimeout();
/* Handle TLS pending data. (must be done before flushAppendOnlyFile) */ /* Handle TLS pending data. (must be done before flushAppendOnlyFile) */
if (tlsHasPendingData()) {
aeReleaseLock(); aeReleaseLock();
tlsProcessPendingData(); tlsProcessPendingData();
aeAcquireLock(); aeAcquireLock();
}
/* If tls still has pending unread data don't sleep at all. */ /* If tls still has pending unread data don't sleep at all. */
aeSetDontWait(eventLoop, tlsHasPendingData()); aeSetDontWait(eventLoop, tlsHasPendingData());
@ -2289,9 +2293,17 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
/* Handle writes with pending output buffers. */ /* Handle writes with pending output buffers. */
int aof_state = g_pserver->aof_state; int aof_state = g_pserver->aof_state;
/* We try to handle writes at the end so we don't have to reacquire the lock,
but if there is a pending async close we need to ensure the writes happen
first so perform it here */
bool fSentReplies = false;
if (listLength(g_pserver->clients_to_close)) {
aeReleaseLock(); aeReleaseLock();
handleClientsWithPendingWrites(iel, aof_state); handleClientsWithPendingWrites(iel, aof_state);
aeAcquireLock(); aeAcquireLock();
fSentReplies = true;
}
/* Close clients that need to be closed asynchronous */ /* Close clients that need to be closed asynchronous */
freeClientsInAsyncFreeQueue(iel); freeClientsInAsyncFreeQueue(iel);
@ -2299,6 +2311,9 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
/* Before we are going to sleep, let the threads access the dataset by /* Before we are going to sleep, let the threads access the dataset by
* releasing the GIL. Redis main thread will not touch anything at this * releasing the GIL. Redis main thread will not touch anything at this
* time. */ * time. */
aeReleaseLock();
if (!fSentReplies)
handleClientsWithPendingWrites(iel, aof_state);
if (moduleCount()) moduleReleaseGIL(TRUE /*fServerThread*/); if (moduleCount()) moduleReleaseGIL(TRUE /*fServerThread*/);
} }
@ -3018,7 +3033,7 @@ static void initServerThread(struct redisServerThreadVars *pvar, int fMain)
pvar->tlsfd_count = 0; pvar->tlsfd_count = 0;
pvar->cclients = 0; pvar->cclients = 0;
pvar->el = aeCreateEventLoop(g_pserver->maxclients+CONFIG_FDSET_INCR); pvar->el = aeCreateEventLoop(g_pserver->maxclients+CONFIG_FDSET_INCR);
aeSetBeforeSleepProc(pvar->el, beforeSleep, 0); aeSetBeforeSleepProc(pvar->el, beforeSleep, AE_SLEEP_THREADSAFE);
aeSetAfterSleepProc(pvar->el, afterSleep, AE_SLEEP_THREADSAFE); aeSetAfterSleepProc(pvar->el, afterSleep, AE_SLEEP_THREADSAFE);
pvar->current_client = nullptr; pvar->current_client = nullptr;
pvar->clients_paused = 0; pvar->clients_paused = 0;
@ -3519,7 +3534,7 @@ void call(client *c, int flags) {
/* Send the command to clients in MONITOR mode if applicable. /* Send the command to clients in MONITOR mode if applicable.
* Administrative commands are considered too dangerous to be shown. */ * Administrative commands are considered too dangerous to be shown. */
if (listLength(g_pserver->monitors) && if (listLength(g_pserver->monitors) &&
!g_pserver->loading && !g_pserver->loading.load(std::memory_order_relaxed) &&
!(c->cmd->flags & (CMD_SKIP_MONITOR|CMD_ADMIN))) !(c->cmd->flags & (CMD_SKIP_MONITOR|CMD_ADMIN)))
{ {
replicationFeedMonitors(c,g_pserver->monitors,c->db->id,c->argv,c->argc); replicationFeedMonitors(c,g_pserver->monitors,c->db->id,c->argv,c->argc);