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

Incorrect memory order on weak ordered architectures

Browse Source 
Former-commit-id: 90162da1a6c025d148a0d1761ae4d5fbc9bfc0ef
This commit is contained in:
John Sully 2020-05-24 01:57:18 -04:00
parent dde860c60b
commit 2ea5bf4f55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.h
View File

@ -801,7 +801,7 @@ public:
void setrefcount(unsigned ref); void setrefcount(unsigned ref);
unsigned getrefcount(std::memory_order order = std::memory_order_relaxed) const { return (refcount.load(order) & ~(1U << 31)); } unsigned getrefcount(std::memory_order order = std::memory_order_relaxed) const { return (refcount.load(order) & ~(1U << 31)); }
void addref() const { refcount.fetch_add(1, std::memory_order_relaxed); } void addref() const { refcount.fetch_add(1, std::memory_order_relaxed); }
unsigned release() const { return refcount.fetch_sub(1, std::memory_order_relaxed) & ~(1U << 31); } unsigned release() const { return refcount.fetch_sub(1, std::memory_order_seq_cst) & ~(1U << 31); }
} robj; } robj;
static_assert(sizeof(redisObject) == 24, "object size is critical, don't increase"); static_assert(sizeof(redisObject) == 24, "object size is critical, don't increase");
@ -1682,7 +1682,7 @@ struct redisServer {
std::atomic<uint64_t> next_client_id; /* Next client unique ID. Incremental. */ std::atomic<uint64_t> next_client_id; /* Next client unique ID. Incremental. */
int protected_mode; /* Don't accept external connections. */ int protected_mode; /* Don't accept external connections. */
long long events_processed_while_blocked; /* processEventsWhileBlocked() */ long long events_processed_while_blocked; /* processEventsWhileBlocked() */
/* RDB / AOF loading information */ /* RDB / AOF loading information */
std::atomic<int> loading; /* We are loading data from disk if true */ std::atomic<int> loading; /* We are loading data from disk if true */
off_t loading_total_bytes; off_t loading_total_bytes;