X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=45b530e491cbfab745576ec6c34f5bd742a6aecf;hb=c4dbc7e56b01545e25bc95ba122c79d4a2631a99;hp=93012a8daa92725fcc8291af7b2df8f59575949e;hpb=831d9dafc253a93f28b5c8db2d37481a93b220e7;p=awesomized%2Flibmemcached diff --git a/libmemcached/stats.c b/libmemcached/stats.c index 93012a8d..45b530e4 100644 --- a/libmemcached/stats.c +++ b/libmemcached/stats.c @@ -178,49 +178,49 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_ *error= MEMCACHED_SUCCESS; - if (!memcmp("pid", key, strlen("pid"))) + if (!memcmp("pid", key, sizeof("pid") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->pid); - else if (!memcmp("uptime", key, strlen("uptime"))) + else if (!memcmp("uptime", key, sizeof("uptime") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->uptime); - else if (!memcmp("time", key, strlen("time"))) + else if (!memcmp("time", key, sizeof("time") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->time); - else if (!memcmp("version", key, strlen("version"))) + else if (!memcmp("version", key, sizeof("version") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%s", memc_stat->version); - else if (!memcmp("pointer_size", key, strlen("pointer_size"))) + else if (!memcmp("pointer_size", key, sizeof("pointer_size") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->pointer_size); - else if (!memcmp("rusage_user", key, strlen("rusage_user"))) + else if (!memcmp("rusage_user", key, sizeof("rusage_user") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", memc_stat->rusage_user_seconds, memc_stat->rusage_user_microseconds); - else if (!memcmp("rusage_system", key, strlen("rusage_system"))) + else if (!memcmp("rusage_system", key, sizeof("rusage_system") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", memc_stat->rusage_system_seconds, memc_stat->rusage_system_microseconds); - else if (!memcmp("curr_items", key, strlen("curr_items"))) + else if (!memcmp("curr_items", key, sizeof("curr_items") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->curr_items); - else if (!memcmp("total_items", key, strlen("total_items"))) + else if (!memcmp("total_items", key, sizeof("total_items") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->total_items); - else if (!memcmp("curr_connections", key, strlen("curr_connections"))) + else if (!memcmp("curr_connections", key, sizeof("curr_connections") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->curr_connections); - else if (!memcmp("total_connections", key, strlen("total_connections"))) + else if (!memcmp("total_connections", key, sizeof("total_connections") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->total_connections); - else if (!memcmp("connection_structures", key, strlen("connection_structures"))) + else if (!memcmp("connection_structures", key, sizeof("connection_structures") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->connection_structures); - else if (!memcmp("cmd_get", key, strlen("cmd_get"))) + else if (!memcmp("cmd_get", key, sizeof("cmd_get") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->cmd_get); - else if (!memcmp("cmd_set", key, strlen("cmd_set"))) + else if (!memcmp("cmd_set", key, sizeof("cmd_set") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->cmd_set); - else if (!memcmp("get_hits", key, strlen("get_hits"))) + else if (!memcmp("get_hits", key, sizeof("get_hits") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->get_hits); - else if (!memcmp("get_misses", key, strlen("get_misses"))) + else if (!memcmp("get_misses", key, sizeof("get_misses") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->get_misses); - else if (!memcmp("evictions", key, strlen("evictions"))) + else if (!memcmp("evictions", key, sizeof("evictions") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->evictions); - else if (!memcmp("bytes_read", key, strlen("bytes_read"))) + else if (!memcmp("bytes_read", key, sizeof("bytes_read") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes_read); - else if (!memcmp("bytes_written", key, strlen("bytes_written"))) + else if (!memcmp("bytes_written", key, sizeof("bytes_written") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes_written); - else if (!memcmp("bytes", key, strlen("bytes"))) + else if (!memcmp("bytes", key, sizeof("bytes") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes); - else if (!memcmp("limit_maxbytes", key, strlen("limit_maxbytes"))) + else if (!memcmp("limit_maxbytes", key, sizeof("limit_maxbytes") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->limit_maxbytes); - else if (!memcmp("threads", key, strlen("threads"))) + else if (! memcmp("threads", key, sizeof("threads") -1)) length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->threads); else { @@ -400,27 +400,42 @@ error: return rc; } -memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error) +memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_return_t *error) { memcached_return_t rc; memcached_stat_st *stats; - unlikely (ptr->flags.use_udp) + if ((rc= initialize_query(self)) != MEMCACHED_SUCCESS) { - *error= MEMCACHED_NOT_SUPPORTED; + if (error) + *error= rc; + + return NULL; + } + + WATCHPOINT_ASSERT(error); + + unlikely (self->flags.use_udp) + { + if (error) + *error= MEMCACHED_NOT_SUPPORTED; + return NULL; } - stats= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st)); + stats= libmemcached_calloc(self, memcached_server_count(self), sizeof(memcached_stat_st)); if (! stats) { - *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE; + if (error) + *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE; + return NULL; } + WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS); rc= MEMCACHED_SUCCESS; - for (uint32_t x= 0; x < memcached_server_count(ptr); x++) + for (uint32_t x= 0; x < memcached_server_count(self); x++) { memcached_return_t temp_return; memcached_server_write_instance_st instance; @@ -428,11 +443,11 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur stat_instance= stats + x; - stat_instance->root= ptr; + stat_instance->root= self; - instance= memcached_server_instance_fetch(ptr, x); + instance= memcached_server_instance_fetch(self, x); - if (ptr->flags.binary_protocol) + if (self->flags.binary_protocol) { temp_return= binary_stats_fetch(stat_instance, args, instance, NULL); } @@ -445,14 +460,15 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur rc= MEMCACHED_SOME_ERRORS; } - *error= rc; + if (error) + *error= rc; + return stats; } memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char *args, const char *hostname, in_port_t port) { - memcached_return_t rc; memcached_st memc; memcached_st *memc_ptr; memcached_server_write_instance_st instance; @@ -460,10 +476,17 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char memset(memc_stat, 0, sizeof(memcached_stat_st)); memc_ptr= memcached_create(&memc); - WATCHPOINT_ASSERT(memc_ptr); + if (! memc_ptr) + return MEMCACHED_MEMORY_ALLOCATION_FAILURE; memcached_server_add(&memc, hostname, port); + memcached_return_t rc; + if ((rc= initialize_query(memc_ptr)) != MEMCACHED_SUCCESS) + { + return rc; + } + instance= memcached_server_instance_fetch(memc_ptr, 0); if (memc.flags.binary_protocol)