projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update tests, improved UDP performance.
[m6w6/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index 9b3535822b9d21e2aaa17af2cfcc856f489beda8..d5d1c234b589f18d205b158d42eee31e1ccaad7c 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-236,7
+236,7
@@
char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
*error= MEMCACHED_SUCCESS;
*error= MEMCACHED_SUCCESS;
- if (
not memcmp("pid", key, sizeof("pid") -1)
)
+ if (
memcmp("pid", key, sizeof("pid") -1) == 0
)
{
length= snprintf(buffer, SMALL_STRING_LEN,"%lld", (signed long long)memc_stat->pid);
}
{
length= snprintf(buffer, SMALL_STRING_LEN,"%lld", (signed long long)memc_stat->pid);
}
@@
-360,7
+360,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
request.message.header.request.keylen= htons(uint16_t(args_length));
request.message.header.request.bodylen= htonl(uint32_t( args_length));
request.message.header.request.keylen= htons(uint16_t(args_length));
request.message.header.request.bodylen= htonl(uint32_t( args_length));
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ request.bytes, sizeof(request.bytes) },
{ args, args_length }
{
{ request.bytes, sizeof(request.bytes) },
{ args, args_length }
@@
-374,7
+374,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
}
else
{
}
else
{
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ request.bytes, sizeof(request.bytes) }
};
{
{ request.bytes, sizeof(request.bytes) }
};
@@
-437,7
+437,7
@@
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
memcached_server_write_instance_st instance,
struct local_context *check)
{
memcached_server_write_instance_st instance,
struct local_context *check)
{
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ memcached_literal_param("stats ") },
{ args, args_length },
{
{ memcached_literal_param("stats ") },
{ args, args_length },
@@
-498,19
+498,18
@@
memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu
error= &unused;
}
error= &unused;
}
- memcached_return_t rc;
- if (memcached_failed(rc= initialize_query(self)))
+ if (memcached_failed(*error= initialize_query(self, true)))
{
{
- *error= rc;
return NULL;
}
return NULL;
}
- if (
self->flags.use_udp
)
+ if (
memcached_is_udp(self)
)
{
*error= memcached_set_error(*self, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT);
return NULL;
}
{
*error= memcached_set_error(*self, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT);
return NULL;
}
+ memcached_return_t rc;
size_t args_length= 0;
if (args)
{
size_t args_length= 0;
if (args)
{
@@
-544,7
+543,7
@@
memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu
memcached_server_write_instance_st instance= memcached_server_instance_fetch(self, x);
memcached_return_t temp_return;
memcached_server_write_instance_st instance= memcached_server_instance_fetch(self, x);
memcached_return_t temp_return;
- if (
self->flags.binary_protocol
)
+ if (
memcached_is_binary(self)
)
{
temp_return= binary_stats_fetch(stat_instance, args, args_length, instance, NULL);
}
{
temp_return= binary_stats_fetch(stat_instance, args, args_length, instance, NULL);
}
@@
-584,7
+583,7
@@
memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
return rc;
}
return rc;
}
- if (memcached_success(rc= initialize_query(memc_ptr)))
+ if (memcached_success(rc= initialize_query(memc_ptr
, true
)))
{
size_t args_length= 0;
if (args)
{
size_t args_length= 0;
if (args)