X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemslap.c;h=38343b86de40f60f732a93cebcba0838e2a0ae90;hb=f9f501287ffa6a2c69a9033536d3b6f14db34204;hp=88a0f21ca25be9b4dde03b8d9b43613d8d368ff5;hpb=e110b4a534fd2d052461777411dac53b40c165bf;p=m6w6%2Flibmemcached diff --git a/clients/memslap.c b/clients/memslap.c index 88a0f21c..38343b86 100644 --- a/clients/memslap.c +++ b/clients/memslap.c @@ -112,7 +112,7 @@ static void ms_options_parse(int argc, char *argv[]); static int ms_check_para(void); static void ms_statistic_init(void); static void ms_stats_init(void); -static void ms_print_statistics(int time); +static void ms_print_statistics(int in_time); static void ms_print_memslap_stats(struct timeval *start_time, struct timeval *end_time); static void ms_monitor_slap_mode(void); @@ -126,6 +126,10 @@ static void ms_sync_lock_init() pthread_mutex_init(&ms_global.init_lock.lock, NULL); pthread_cond_init(&ms_global.init_lock.cond, NULL); + ms_global.warmup_lock.count = 0; + pthread_mutex_init(&ms_global.warmup_lock.lock, NULL); + pthread_cond_init(&ms_global.warmup_lock.cond, NULL); + ms_global.run_lock.count= 0; pthread_mutex_init(&ms_global.run_lock.lock, NULL); pthread_cond_init(&ms_global.run_lock.cond, NULL); @@ -141,6 +145,9 @@ static void ms_sync_lock_destroy() pthread_mutex_destroy(&ms_global.init_lock.lock); pthread_cond_destroy(&ms_global.init_lock.cond); + pthread_mutex_destroy(&ms_global.warmup_lock.lock); + pthread_cond_destroy(&ms_global.warmup_lock.cond); + pthread_mutex_destroy(&ms_global.run_lock.lock); pthread_cond_destroy(&ms_global.run_lock.cond); @@ -449,7 +456,7 @@ static void ms_options_parse(int argc, char *argv[]) break; case OPT_THREAD_NUMBER: /* --threads or -T */ - ms_setting.nthreads= (int)strtol(optarg, (char **) NULL, 10); + ms_setting.nthreads= (uint32_t)strtoul(optarg, (char **) NULL, 10); if (ms_setting.nthreads <= 0) { fprintf(stderr, "Threads number must be greater than 0.:-)\n"); @@ -565,7 +572,7 @@ static void ms_options_parse(int argc, char *argv[]) break; case OPT_SOCK_PER_CONN: /* --conn_sock or -n */ - ms_setting.sock_per_conn= (int)strtol(optarg, (char **) NULL, 10); + ms_setting.sock_per_conn= (uint32_t)strtoul(optarg, (char **) NULL, 10); if (ms_setting.sock_per_conn <= 0) { fprintf(stderr, "Number of socks of each concurrency " @@ -602,7 +609,7 @@ static void ms_options_parse(int argc, char *argv[]) break; case OPT_REP_WRITE_SRV: /* --rep_write or -p */ - ms_setting.rep_write_srv= (int)strtol(optarg, (char **) NULL, 10); + ms_setting.rep_write_srv= (uint32_t)strtoul(optarg, (char **) NULL, 10); if (ms_setting.rep_write_srv <= 0) { fprintf(stderr, @@ -699,53 +706,45 @@ static void ms_print_memslap_stats(struct timeval *start_time, char buf[1024]; char *pos= buf; - pos+= sprintf(pos, - "cmd_get: %llu\n", - (unsigned long long)ms_stats.cmd_get); - pos+= sprintf(pos, - "cmd_set: %llu\n", - (unsigned long long)ms_stats.cmd_set); - pos+= sprintf(pos, - "get_misses: %llu\n", - (unsigned long long)ms_stats.get_misses); + pos+= sprintf(pos, "cmd_get: %zu\n", + ms_stats.cmd_get); + pos+= sprintf(pos, "cmd_set: %zu\n", + ms_stats.cmd_set); + pos+= sprintf(pos, "get_misses: %zu\n", + ms_stats.get_misses); if (ms_setting.verify_percent > 0) { - pos+= sprintf(pos, "verify_misses: %llu\n", - (unsigned long long)ms_stats.vef_miss); - pos+= sprintf(pos, "verify_failed: %llu\n", - (unsigned long long)ms_stats.vef_failed); + pos+= sprintf(pos, "verify_misses: %zu\n", + ms_stats.vef_miss); + pos+= sprintf(pos, "verify_failed: %zu\n", + ms_stats.vef_failed); } if (ms_setting.exp_ver_per > 0) { - pos+= sprintf(pos, "expired_get: %llu\n", - (unsigned long long)ms_stats.exp_get); - pos+= sprintf(pos, "unexpired_unget: %llu\n", - (unsigned long long)ms_stats.unexp_unget); + pos+= sprintf(pos, "expired_get: %zu\n", + ms_stats.exp_get); + pos+= sprintf(pos, "unexpired_unget: %zu\n", + ms_stats.unexp_unget); } pos+= sprintf(pos, - "written_bytes: %llu\n", - (unsigned long long)ms_stats.bytes_written); - pos+= sprintf(pos, - "read_bytes: %llu\n", - (unsigned long long)ms_stats.bytes_read); - pos+= sprintf(pos, - "object_bytes: %llu\n", - (unsigned long long)ms_stats.obj_bytes); + "written_bytes: %zu\n", + ms_stats.bytes_written); + pos+= sprintf(pos, "read_bytes: %zu\n", + ms_stats.bytes_read); + pos+= sprintf(pos, "object_bytes: %zu\n", + ms_stats.obj_bytes); if (ms_setting.udp || ms_setting.facebook_test) { - pos+= sprintf(pos, - "packet_disorder: %llu\n", - (unsigned long long)ms_stats.pkt_disorder); - pos+= sprintf(pos, - "packet_drop: %llu\n", - (unsigned long long)ms_stats.pkt_drop); - pos+= sprintf(pos, - "udp_timeout: %llu\n", - (unsigned long long)ms_stats.udp_timeout); + pos+= sprintf(pos, "packet_disorder: %zu\n", + ms_stats.pkt_disorder); + pos+= sprintf(pos, "packet_drop: %zu\n", + ms_stats.pkt_drop); + pos+= sprintf(pos, "udp_timeout: %zu\n", + ms_stats.udp_timeout); } if (ms_setting.stat_freq > 0) @@ -779,19 +778,26 @@ static void ms_monitor_slap_mode() int second= 0; struct timeval start_time, end_time; + /* Wait all the threads complete initialization. */ + pthread_mutex_lock(&ms_global.init_lock.lock); + while (ms_global.init_lock.count < ms_setting.nthreads) + { + pthread_cond_wait(&ms_global.init_lock.cond, + &ms_global.init_lock.lock); + } + pthread_mutex_unlock(&ms_global.init_lock.lock); + /* only when there is no set operation it need warm up */ if (ms_setting.cmd_distr[CMD_SET].cmd_prop < PROP_ERROR) { /* Wait all the connects complete warm up. */ - pthread_mutex_lock(&ms_global.init_lock.lock); - while (ms_global.init_lock.count < (int)ms_setting.nconns) + pthread_mutex_lock(&ms_global.warmup_lock.lock); + while (ms_global.warmup_lock.count < ms_setting.nconns) { - pthread_cond_wait(&ms_global.init_lock.cond, - &ms_global.init_lock.lock); + pthread_cond_wait(&ms_global.warmup_lock.cond, &ms_global.warmup_lock.lock); } - pthread_mutex_unlock(&ms_global.init_lock.lock); + pthread_mutex_unlock(&ms_global.warmup_lock.lock); } - ms_global.finish_warmup= true; /* running in "run time" mode, user specify run time */ @@ -834,7 +840,7 @@ static void ms_monitor_slap_mode() * We loop until we know that all connects have cleaned up. */ pthread_mutex_lock(&ms_global.run_lock.lock); - while (ms_global.run_lock.count < (int)ms_setting.nconns) + while (ms_global.run_lock.count < ms_setting.nconns) { pthread_cond_wait(&ms_global.run_lock.cond, &ms_global.run_lock.lock); }