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

time thread lock uses fastlock instead of std::mutex

Browse Source
This commit is contained in:
Malavan Sotheeswaran 2022-01-26 14:02:39 -08:00 committed by John Sully
parent fa0a60240b
commit 6d1cd00f15
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.cpp
View File

@ -62,7 +62,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <algorithm> #include <algorithm>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <mutex>
#include <condition_variable> #include <condition_variable>
#include "aelocker.h" #include "aelocker.h"
#include "motd.h" #include "motd.h"
@ -96,8 +95,8 @@ struct redisServer server; /* Server global state */
redisServer *g_pserver = &GlobalHidden::server; redisServer *g_pserver = &GlobalHidden::server;
struct redisServerConst cserver; struct redisServerConst cserver;
thread_local struct redisServerThreadVars *serverTL = NULL; // thread local server vars thread_local struct redisServerThreadVars *serverTL = NULL; // thread local server vars
std::mutex time_thread_mutex; fastlock time_thread_lock("Time thread lock");
std::condition_variable time_thread_cv; std::condition_variable_any time_thread_cv;
int sleeping_threads = 0; int sleeping_threads = 0;
void wakeTimeThread(); void wakeTimeThread();
@ -2959,7 +2958,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
// Scope lock_guard // Scope lock_guard
{ {
std::lock_guard<std::mutex> lock(time_thread_mutex); std::unique_lock<fastlock> lock(time_thread_lock);
sleeping_threads++; sleeping_threads++;
serverAssert(sleeping_threads <= cserver.cthreads); serverAssert(sleeping_threads <= cserver.cthreads);
} }
@ -7206,7 +7205,7 @@ void OnTerminate()
void wakeTimeThread() { void wakeTimeThread() {
updateCachedTime(); updateCachedTime();
std::lock_guard<std::mutex> lock(time_thread_mutex); std::unique_lock<fastlock> lock(time_thread_lock);
if (sleeping_threads >= cserver.cthreads) if (sleeping_threads >= cserver.cthreads)
time_thread_cv.notify_one(); time_thread_cv.notify_one();
sleeping_threads--; sleeping_threads--;
@ -7221,7 +7220,7 @@ void *timeThreadMain(void*) {
aeThreadOnline(); aeThreadOnline();
while (true) { while (true) {
{ {
std::unique_lock<std::mutex> lock(time_thread_mutex); std::unique_lock<fastlock> lock(time_thread_lock);
if (sleeping_threads >= cserver.cthreads) { if (sleeping_threads >= cserver.cthreads) {
aeThreadOffline(); aeThreadOffline();
time_thread_cv.wait(lock); time_thread_cv.wait(lock);