From bbb08af2941a5e2f7dab38434f6bf82de8b40a4d Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 15 Apr 2020 22:25:17 -0400 Subject: [PATCH] Convert variables accessed outside lock to atomics Former-commit-id: b0796ff5fd7e069a2fadbfd968f7bbb2020edd2d --- src/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.h b/src/server.h index 24fa8a6f1..10941adfc 100644 --- a/src/server.h +++ b/src/server.h @@ -1631,7 +1631,7 @@ struct redisServer { struct redisServerThreadVars rgthreadvar[MAX_EVENT_LOOPS]; std::atomic lruclock; /* Clock for LRU eviction */ - int shutdown_asap; /* SHUTDOWN needed ASAP */ + std::atomic shutdown_asap; /* SHUTDOWN needed ASAP */ int activerehashing; /* Incremental rehash in serverCron() */ int active_defrag_running; /* Active defragmentation running (holds current scan aggressiveness) */ int cronloops; /* Number of times the cron function run */ @@ -1666,7 +1666,7 @@ struct redisServer { std::atomic next_client_id; /* Next client unique ID. Incremental. */ int protected_mode; /* Don't accept external connections. */ /* RDB / AOF loading information */ - int loading; /* We are loading data from disk if true */ + std::atomic loading; /* We are loading data from disk if true */ off_t loading_total_bytes; off_t loading_loaded_bytes; time_t loading_start_time;