projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates from ddm4
[awesomized/libmemcached]
/
clients
/
ms_memslap.h
diff --git
a/clients/ms_memslap.h
b/clients/ms_memslap.h
index 8777c5bb2466a14419a37b5e6be47699c926adb4..1c1b29ebe7f38163ab84f745aad80710bdb6bc35 100644
(file)
--- a/
clients/ms_memslap.h
+++ b/
clients/ms_memslap.h
@@
-55,7
+55,7
@@
typedef enum
OPT_BINARY_PROTOCOL= 'B',
OPT_OVERWRITE= 'o',
OPT_TPS= 'P',
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 */
} ms_options_t;
/* global statistic of response time */
@@
-71,7
+71,7
@@
typedef struct statistic
/* global status statistic structure */
typedef struct stats
{
/* global status statistic structure */
typedef struct stats
{
- volatile int32_t active_conns; /* active connections */
+ volatile
u
int32_t active_conns; /* active connections */
size_t bytes_read; /* read bytes */
size_t bytes_written; /* written bytes */
size_t obj_bytes; /* object bytes */
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
{
/* lock adapter */
typedef struct sync_lock
{
-
in
t count;
+
uint32_
t count;
pthread_mutex_t lock;
pthread_cond_t cond;
} ms_sync_lock_t;
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;
{
/* 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 */
ms_sync_lock_t run_lock;
/* mutex for outputing error log synchronously when memslap crashes */