summaryrefslogtreecommitdiff
path: root/src/redis-benchmark.c
diff options
context:
space:
mode:
authorWang Yuan <wangyuan21@baidu.com>2020-09-17 21:01:45 +0800
committerGitHub <noreply@github.com>2020-09-17 16:01:45 +0300
commit445a4b669a3a7232a18bf23340c5f7d580aa92c7 (patch)
treea129255257c274a946489b4389e410ab928f4484 /src/redis-benchmark.c
parent092cfca5224e8e88053cd5b8a7b82f0f14b17011 (diff)
downloadredis-445a4b669a3a7232a18bf23340c5f7d580aa92c7.tar.gz
Implement redisAtomic to replace _Atomic C11 builtin (#7707)
Redis 6.0 introduces I/O threads, it is so cool and efficient, we use C11 _Atomic to establish inter-thread synchronization without mutex. But the compiler that must supports C11 _Atomic can compile redis code, that brings a lot of inconvenience since some common platforms can't support by default such as CentOS7, so we want to implement redis atomic type to make it more portable. We have implemented our atomic variable for redis that only has 'relaxed' operations in src/atomicvar.h, so we implement some operations with 'sequentially-consistent', just like the default behavior of C11 _Atomic that can establish inter-thread synchronization. And we replace all uses of C11 _Atomic with redis atomic variable. Our implementation of redis atomic variable uses C11 _Atomic, __atomic or __sync macros if available, it supports most common platforms, and we will detect automatically which feature we use. In Makefile we use a dummy file to detect if the compiler supports C11 _Atomic. Now for gcc, we can compile redis code theoretically if your gcc version is not less than 4.1.2(starts to support __sync_xxx operations). Otherwise, we remove use mutex fallback to implement redis atomic variable for performance and test. You will get compiling errors if your compiler doesn't support all features of above. For cover redis atomic variable tests, we add other CI jobs that build redis on CentOS6 and CentOS7 and workflow daily jobs that run the tests on them. For them, we just install gcc by default in order to cover different compiler versions, gcc is 4.4.7 by default installation on CentOS6 and 4.8.5 on CentOS7. We restore the feature that we can test redis with Helgrind to find data race errors. But you need install Valgrind in the default path configuration firstly before running your tests, since we use macros in helgrind.h to tell Helgrind inter-thread happens-before relationship explicitly for avoiding false positives. Please open an issue on github if you find data race errors relate to this commit. Unrelated: - Fix redefinition of typedef 'RedisModuleUserChangedFunc' For some old version compilers, they will report errors or warnings, if we re-define function type.
Diffstat (limited to 'src/redis-benchmark.c')
-rw-r--r--src/redis-benchmark.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index a221ebdd2..7a7828184 100644
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -76,11 +76,11 @@ static struct config {
int hostport;
const char *hostsocket;
int numclients;
- int liveclients;
+ redisAtomic int liveclients;
int requests;
- int requests_issued;
- int requests_finished;
- int previous_requests_finished;
+ redisAtomic int requests_issued;
+ redisAtomic int requests_finished;
+ redisAtomic int previous_requests_finished;
int last_printed_bytes;
long long previous_tick;
int keysize;
@@ -113,18 +113,12 @@ static struct config {
struct redisConfig *redis_config;
struct hdr_histogram* latency_histogram;
struct hdr_histogram* current_sec_latency_histogram;
- int is_fetching_slots;
- int is_updating_slots;
- int slots_last_update;
+ redisAtomic int is_fetching_slots;
+ redisAtomic int is_updating_slots;
+ redisAtomic int slots_last_update;
int enable_tracking;
- /* Thread mutexes to be used as fallbacks by atomicvar.h */
- pthread_mutex_t requests_issued_mutex;
- pthread_mutex_t requests_finished_mutex;
pthread_mutex_t liveclients_mutex;
- pthread_mutex_t is_fetching_slots_mutex;
pthread_mutex_t is_updating_slots_mutex;
- pthread_mutex_t updating_slots_mutex;
- pthread_mutex_t slots_last_update_mutex;
} config;
typedef struct _client {
@@ -1669,13 +1663,8 @@ int main(int argc, const char **argv) {
fprintf(stderr, "WARN: could not fetch server CONFIG\n");
}
if (config.num_threads > 0) {
- pthread_mutex_init(&(config.requests_issued_mutex), NULL);
- pthread_mutex_init(&(config.requests_finished_mutex), NULL);
pthread_mutex_init(&(config.liveclients_mutex), NULL);
- pthread_mutex_init(&(config.is_fetching_slots_mutex), NULL);
pthread_mutex_init(&(config.is_updating_slots_mutex), NULL);
- pthread_mutex_init(&(config.updating_slots_mutex), NULL);
- pthread_mutex_init(&(config.slots_last_update_mutex), NULL);
}
if (config.keepalive == 0) {