projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for non-Linux platforms.
[m6w6/libmemcached]
/
libmemcached
/
stats.c
diff --git
a/libmemcached/stats.c
b/libmemcached/stats.c
index d162277ac0639ecf4640e5a4e9fa6bc2e213bd6a..1f3ca5bf8700db57a0de8a1111df784a28de8c8a 100644
(file)
--- a/
libmemcached/stats.c
+++ b/
libmemcached/stats.c
@@
-151,7
+151,8
@@
static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char
strcmp("listen_disabled_num", key) == 0 ||
strcmp("conn_yields", key) == 0 ||
strcmp("auth_cmds", key) == 0 ||
strcmp("listen_disabled_num", key) == 0 ||
strcmp("conn_yields", key) == 0 ||
strcmp("auth_cmds", key) == 0 ||
- strcmp("auth_errors", key) == 0))
+ strcmp("auth_errors", key) == 0 ||
+ strcmp("reclaimed", key) == 0))
{
WATCHPOINT_STRING(key);
return MEMCACHED_UNKNOWN_STAT_KEY;
{
WATCHPOINT_STRING(key);
return MEMCACHED_UNKNOWN_STAT_KEY;
@@
-250,8
+251,8
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
request.message.header.request.bodylen= htonl((uint32_t) len);
if ((memcached_do(instance, request.bytes,
request.message.header.request.bodylen= htonl((uint32_t) len);
if ((memcached_do(instance, request.bytes,
- sizeof(request.bytes),
0
) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(instance, args, len,
1
) == -1))
+ sizeof(request.bytes),
false
) != MEMCACHED_SUCCESS) ||
+ (memcached_io_write(instance, args, len,
true
) == -1))
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
@@
-260,7
+261,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
else
{
if (memcached_do(instance, request.bytes,
else
{
if (memcached_do(instance, request.bytes,
- sizeof(request.bytes),
1
) != MEMCACHED_SUCCESS)
+ sizeof(request.bytes),
true
) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
@@
-314,7
+315,7
@@
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(instance, buffer, send_length,
1
);
+ rc= memcached_do(instance, buffer, send_length,
true
);
if (rc != MEMCACHED_SUCCESS)
goto error;
if (rc != MEMCACHED_SUCCESS)
goto error;
@@
-357,7
+358,6
@@
error:
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error)
{
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error)
{
- uint32_t x;
memcached_return_t rc;
memcached_stat_st *stats;
memcached_return_t rc;
memcached_stat_st *stats;
@@
-369,29
+369,32
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
stats= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
stats= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
- stats->root= ptr;
-
- if (!stats)
+ if (! stats)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
rc= MEMCACHED_SUCCESS;
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
rc= MEMCACHED_SUCCESS;
- for (x= 0; x < memcached_server_count(ptr); x++)
+ for (
uint32_t
x= 0; x < memcached_server_count(ptr); x++)
{
memcached_return_t temp_return;
memcached_server_instance_st *instance;
{
memcached_return_t temp_return;
memcached_server_instance_st *instance;
+ memcached_stat_st *stat_instance;
+
+ stat_instance= stats + x;
+
+ stat_instance->root= ptr;
instance= memcached_server_instance_fetch(ptr, x);
if (ptr->flags.binary_protocol)
{
instance= memcached_server_instance_fetch(ptr, x);
if (ptr->flags.binary_protocol)
{
- temp_return= binary_stats_fetch(stat
s + x
, args, instance);
+ temp_return= binary_stats_fetch(stat
_instance
, args, instance);
}
else
{
}
else
{
- temp_return= ascii_stats_fetch(stat
s + x
, args, instance);
+ temp_return= ascii_stats_fetch(stat
_instance
, args, instance);
}
if (temp_return != MEMCACHED_SUCCESS)
}
if (temp_return != MEMCACHED_SUCCESS)
@@
-443,12
+446,10
@@
char ** memcached_stat_get_keys(memcached_st *ptr,
size_t length= sizeof(memcached_stat_keys);
(void)memc_stat;
size_t length= sizeof(memcached_stat_keys);
(void)memc_stat;
-#if 0
- list= libmemcached_malloc(memc_stat ? memc_stat->root : ptr, length);
-#endif
+
list= libmemcached_malloc(ptr, length);
list= libmemcached_malloc(ptr, length);
- if (!list)
+ if (!
list)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;