diff options
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server.h b/src/server.h index 12ccd8c0b..8403ed5ba 100644 --- a/src/server.h +++ b/src/server.h @@ -861,7 +861,6 @@ struct redisServer { dict *orig_commands; /* Command table before command renaming. */ aeEventLoop *el; unsigned int lruclock; /* Clock for LRU eviction */ - pthread_mutex_t lruclock_mutex; int shutdown_asap; /* SHUTDOWN needed ASAP */ int activerehashing; /* Incremental rehash in serverCron() */ int active_defrag_running; /* Active defragmentation running (holds current scan aggressiveness) */ @@ -901,7 +900,6 @@ struct redisServer { char neterr[ANET_ERR_LEN]; /* Error buffer for anet.c */ dict *migrate_cached_sockets;/* MIGRATE cached sockets */ uint64_t next_client_id; /* Next client unique ID. Incremental. */ - pthread_mutex_t next_client_id_mutex; int protected_mode; /* Don't accept external connections. */ /* RDB / AOF loading information */ int loading; /* We are loading data from disk if true */ @@ -1173,6 +1171,12 @@ struct redisServer { int watchdog_period; /* Software watchdog period in ms. 0 = off */ /* System hardware info */ size_t system_memory_size; /* Total memory in system as reported by OS */ + + /* Mutexes used to protect atomic variables when atomic builtins are + * not available. */ + pthread_mutex_t lruclock_mutex; + pthread_mutex_t next_client_id_mutex; + pthread_mutex_t unixtime_mutex; }; typedef struct pubsubPattern { |