X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fms_memslap.h;h=1c1b29ebe7f38163ab84f745aad80710bdb6bc35;hb=b6719ab469b16022edd830cb90bc476b17fa6743;hp=51023d9d2514868722b2f0c3690d7e5f6ae6bbb6;hpb=d39962cd481eb10a7d9dceb6d442af0fd49521fb;p=awesomized%2Flibmemcached

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index 51023d9d..1c1b29eb 100644
--- a/clients/ms_memslap.h
+++ b/clients/ms_memslap.h
@@ -19,7 +19,9 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <pthread.h>
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <math.h>
 
 #include "ms_stats.h"
@@ -53,7 +55,7 @@ typedef enum
   OPT_BINARY_PROTOCOL= 'B',
   OPT_OVERWRITE= 'o',
   OPT_TPS= 'P',
-  OPT_REP_WRITE_SRV= 'p',
+  OPT_REP_WRITE_SRV= 'p'
 } ms_options_t;
 
 /* global statistic of response time */
@@ -90,7 +92,7 @@ typedef struct stats
 /* lock adapter */
 typedef struct sync_lock
 {
-  int count;
+  uint32_t count;
   pthread_mutex_t lock;
   pthread_cond_t cond;
 } ms_sync_lock_t;
@@ -100,6 +102,7 @@ typedef struct global
 {
   /* synchronize lock */
   ms_sync_lock_t init_lock;
+  ms_sync_lock_t warmup_lock;
   ms_sync_lock_t run_lock;
 
   /* mutex for outputing error log synchronously when memslap crashes */