Merge

[m6w6/libmemcached] / clients / ms_memslap.h

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index 8777c5bb2466a14419a37b5e6be47699c926adb4..dc0844d82ff2496eb03ca86a61fea5f59d9784cd 100644 (file)
--- a/clients/ms_memslap.h
+++ b/clients/ms_memslap.h
@@ -71,7 +71,7 @@ typedef struct statistic
 /* global status statistic structure */
 typedef struct stats
 {
-  volatile int32_t active_conns;   /* active connections */
+  volatile uint32_t active_conns;   /* active connections */
   size_t bytes_read;              /* read bytes */
   size_t bytes_written;           /* written bytes */
   size_t obj_bytes;               /* object bytes */
@@ -92,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;
@@ -102,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 */