projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated for custom hash functions/setting functions.
[awesomized/libmemcached]
/
libmemcached
/
stats.c
diff --git
a/libmemcached/stats.c
b/libmemcached/stats.c
index 4f3bdb0d0af548b15fa2465d16feb1c209dba674..6378d89e0a2d087336c672b39a37f4890750cb1f 100644
(file)
--- a/
libmemcached/stats.c
+++ b/
libmemcached/stats.c
@@
-219,17
+219,16
@@
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat,
return NULL;
}
return NULL;
}
- ret=
ptr->call
_malloc(ptr, (size_t) (length + 1));
+ ret=
libmemcached
_malloc(ptr, (size_t) (length + 1));
memcpy(ret, buffer, (size_t) length);
ret[length]= '\0';
return ret;
}
memcpy(ret, buffer, (size_t) length);
ret[length]= '\0';
return ret;
}
-static memcached_return_t binary_stats_fetch(memcached_st *ptr,
- memcached_stat_st *memc_stat,
+static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
char *args,
char *args,
-
unsigned int server_key
)
+
memcached_server_instance_st *instance
)
{
memcached_return_t rc;
{
memcached_return_t rc;
@@
-250,35
+249,35
@@
static memcached_return_t binary_stats_fetch(memcached_st *ptr,
request.message.header.request.keylen= htons((uint16_t)len);
request.message.header.request.bodylen= htonl((uint32_t) len);
request.message.header.request.keylen= htons((uint16_t)len);
request.message.header.request.bodylen= htonl((uint32_t) len);
- if ((memcached_do(
&ptr->hosts[server_key]
, request.bytes,
+ if ((memcached_do(
instance
, request.bytes,
sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(
&ptr->hosts[server_key]
, args, len, 1) == -1))
+ (memcached_io_write(
instance
, args, len, 1) == -1))
{
{
- memcached_io_reset(
&ptr->hosts[server_key]
);
+ memcached_io_reset(
instance
);
return MEMCACHED_WRITE_FAILURE;
}
}
else
{
return MEMCACHED_WRITE_FAILURE;
}
}
else
{
- if (memcached_do(
&ptr->hosts[server_key]
, request.bytes,
+ if (memcached_do(
instance
, request.bytes,
sizeof(request.bytes), 1) != MEMCACHED_SUCCESS)
{
sizeof(request.bytes), 1) != MEMCACHED_SUCCESS)
{
- memcached_io_reset(
&ptr->hosts[server_key]
);
+ memcached_io_reset(
instance
);
return MEMCACHED_WRITE_FAILURE;
}
}
return MEMCACHED_WRITE_FAILURE;
}
}
- memcached_server_response_decrement(
&ptr->hosts[server_key]
);
+ memcached_server_response_decrement(
instance
);
do
{
do
{
- rc= memcached_response(
&ptr->hosts[server_key]
, buffer,
+ rc= memcached_response(
instance
, buffer,
sizeof(buffer), NULL);
if (rc == MEMCACHED_END)
break;
unlikely (rc != MEMCACHED_SUCCESS)
{
sizeof(buffer), NULL);
if (rc == MEMCACHED_END)
break;
unlikely (rc != MEMCACHED_SUCCESS)
{
- memcached_io_reset(
&ptr->hosts[server_key]
);
+ memcached_io_reset(
instance
);
return rc;
}
return rc;
}
@@
-292,15
+291,14
@@
static memcached_return_t binary_stats_fetch(memcached_st *ptr,
/* shit... memcached_response will decrement the counter, so I need to
** reset it.. todo: look at this and try to find a better solution.
*/
/* shit... memcached_response will decrement the counter, so I need to
** reset it.. todo: look at this and try to find a better solution.
*/
-
ptr->hosts[server_key].
cursor_active= 0;
+
instance->
cursor_active= 0;
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-static memcached_return_t ascii_stats_fetch(memcached_st *ptr,
- memcached_stat_st *memc_stat,
+static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
char *args,
char *args,
-
unsigned int server_key
)
+
memcached_server_instance_st *instance
)
{
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
{
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@
-316,13
+314,13
@@
static memcached_return_t ascii_stats_fetch(memcached_st *ptr,
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(
&ptr->hosts[server_key]
, buffer, send_length, 1);
+ rc= memcached_do(
instance
, buffer, send_length, 1);
if (rc != MEMCACHED_SUCCESS)
goto error;
while (1)
{
if (rc != MEMCACHED_SUCCESS)
goto error;
while (1)
{
- rc= memcached_response(
&ptr->hosts[server_key]
, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+ rc= memcached_response(
instance
, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
if (rc == MEMCACHED_STAT)
{
if (rc == MEMCACHED_STAT)
{
@@
-359,7
+357,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)
{
- unsigned int x;
memcached_return_t rc;
memcached_stat_st *stats;
memcached_return_t rc;
memcached_stat_st *stats;
@@
-369,25
+366,35
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
return NULL;
}
return NULL;
}
- stats=
ptr->call_calloc(ptr, ptr->number_of_hosts
, 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 < ptr->number_of_hosts
; x++)
+ for (
uint32_t x= 0; x < memcached_server_count(ptr)
; x++)
{
memcached_return_t temp_return;
{
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)
if (ptr->flags.binary_protocol)
- temp_return= binary_stats_fetch(ptr, stats + x, args, x);
+ {
+ temp_return= binary_stats_fetch(stat_instance, args, instance);
+ }
else
else
- temp_return= ascii_stats_fetch(ptr, stats + x, args, x);
+ {
+ temp_return= ascii_stats_fetch(stat_instance, args, instance);
+ }
if (temp_return != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
if (temp_return != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
@@
-403,16
+410,23
@@
memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
memcached_return_t rc;
memcached_st memc;
memcached_st *memc_ptr;
memcached_return_t rc;
memcached_st memc;
memcached_st *memc_ptr;
+ memcached_server_instance_st *instance;
memc_ptr= memcached_create(&memc);
WATCHPOINT_ASSERT(memc_ptr);
memcached_server_add(&memc, hostname, port);
memc_ptr= memcached_create(&memc);
WATCHPOINT_ASSERT(memc_ptr);
memcached_server_add(&memc, hostname, port);
+ instance= memcached_server_instance_fetch(memc_ptr, 0);
+
if (memc.flags.binary_protocol)
if (memc.flags.binary_protocol)
- rc= binary_stats_fetch(&memc, memc_stat, args, 0);
+ {
+ rc= binary_stats_fetch(memc_stat, args, instance);
+ }
else
else
- rc= ascii_stats_fetch(&memc, memc_stat, args, 0);
+ {
+ rc= ascii_stats_fetch(memc_stat, args, instance);
+ }
memcached_free(&memc);
memcached_free(&memc);
@@
-423,16
+437,18
@@
memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
We make a copy of the keys since at some point in the not so distant future
we will add support for "found" keys.
*/
We make a copy of the keys since at some point in the not so distant future
we will add support for "found" keys.
*/
-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat,
+char ** memcached_stat_get_keys(memcached_st *ptr,
+ memcached_stat_st *memc_stat,
memcached_return_t *error)
{
memcached_return_t *error)
{
- (void) memc_stat;
char **list;
size_t length= sizeof(memcached_stat_keys);
char **list;
size_t length= sizeof(memcached_stat_keys);
- list= ptr->call_malloc(ptr, length);
+ (void)memc_stat;
+
+ list= libmemcached_malloc(ptr, length);
- if (!list)
+ if (!
list)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
@@
-455,11
+471,11
@@
void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat)
if (memc_stat->root)
{
if (memc_stat->root)
{
-
memc_stat->root->call_free(ptr
, memc_stat);
+
libmemcached_free(memc_stat->root
, memc_stat);
}
else if (ptr)
{
}
else if (ptr)
{
-
ptr->call
_free(ptr, memc_stat);
+
libmemcached
_free(ptr, memc_stat);
}
else
{
}
else
{