File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change 28
28
#include " memcached.h"
29
29
#include " mc_time.h"
30
30
31
+ #include < atomic>
32
+
31
33
extern volatile sig_atomic_t memcached_shutdown;
32
34
33
35
/*
@@ -48,7 +50,7 @@ const time_t memcached_check_system_time = 60;
48
50
*/
49
51
const time_t memcached_maximum_relative_time = 60 *60 *24 *30 ;
50
52
51
- static volatile rel_time_t memcached_uptime = 0 ;
53
+ static std::atomic< rel_time_t > memcached_uptime ( 0 ) ;
52
54
static volatile time_t memcached_epoch = 0 ;
53
55
static volatile uint64_t memcached_monotonic_start = 0 ;
54
56
static struct event_base * main_ev_base = NULL ;
@@ -189,7 +191,7 @@ static void mc_time_clock_tick(void) {
189
191
" memcached_uptime = %u, new memcached_epoch = %lu, "
190
192
" next check %lu\n " ,
191
193
difference, memcached_epoch,
192
- memcached_uptime, (timeofday.tv_sec - memcached_uptime),
194
+ memcached_uptime. load () , (timeofday.tv_sec - memcached_uptime),
193
195
check_system_time + memcached_check_system_time);
194
196
}
195
197
/* adjust memcached_epoch to ensure correct timeofday can
You can’t perform that action at this time.
0 commit comments