X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.cc;h=eb3376802664956d50af89f060b8372b5e5bca47;hb=5d44e2b91e7055316b538128ec37c0fa81bbc28d;hp=cfe870b9985c7f7d817638f6fb698dc113713183;hpb=b5495838fb245aa1068a1198ed549b98a9c3e666;p=awesomized%2Flibmemcached diff --git a/libmemcached/stats.cc b/libmemcached/stats.cc index cfe870b9..eb337680 100644 --- a/libmemcached/stats.cc +++ b/libmemcached/stats.cc @@ -95,11 +95,11 @@ static memcached_return_t set_data(memcached_stat_st *memc_stat, const char *key if (temp <= INT32_MAX and ( sizeof(pid_t) == sizeof(int32_t) )) { - memc_stat->pid= temp; + memc_stat->pid= pid_t(temp); } else if (temp > -1) { - memc_stat->pid= temp; + memc_stat->pid= pid_t(temp); } else { @@ -232,7 +232,6 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_ { char buffer[SMALL_STRING_LEN]; int length; - char *ret; *error= MEMCACHED_SUCCESS; @@ -336,7 +335,8 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_ return NULL; } - ret= static_cast(libmemcached_malloc(ptr, (size_t) (length + 1))); + // User is responsible for free() memory, so use malloc() + char *ret= static_cast(malloc(size_t(length +1))); memcpy(ret, buffer, (size_t) length); ret[length]= '\0'; @@ -346,7 +346,7 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, const char *args, const size_t args_length, - memcached_server_write_instance_st instance, + org::libmemcached::Instance* instance, struct local_context *check) { char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; @@ -389,7 +389,7 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, } memcached_server_response_decrement(instance); - do + while (1) { memcached_return_t rc= memcached_response(instance, buffer, sizeof(buffer), NULL); @@ -422,13 +422,13 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, WATCHPOINT_ASSERT(0); } } - } while (1); + } /* * memcached_response will decrement the counter, so I need to reset it.. * todo: look at this and try to find a better solution. * */ - instance->cursor_active= 0; + instance->cursor_active_= 0; return MEMCACHED_SUCCESS; } @@ -436,7 +436,7 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat, const char *args, const size_t args_length, - memcached_server_write_instance_st instance, + org::libmemcached::Instance* instance, struct local_context *check) { libmemcached_io_vector_st vector[]= @@ -552,7 +552,7 @@ memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu stat_instance->pid= -1; stat_instance->root= self; - memcached_server_write_instance_st instance= memcached_server_instance_fetch(self, x); + org::libmemcached::Instance* instance= memcached_instance_fetch(self, x); memcached_return_t temp_return; if (memcached_is_binary(self)) @@ -587,6 +587,12 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char { memcached_st memc; + memcached_stat_st unused_memc_stat; + if (memc_stat == NULL) + { + memc_stat= &unused_memc_stat; + } + memset(memc_stat, 0, sizeof(memcached_stat_st)); memcached_st *memc_ptr= memcached_create(&memc); @@ -613,7 +619,7 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char if (memcached_success(rc)) { - memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc_ptr, 0); + org::libmemcached::Instance* instance= memcached_instance_fetch(memc_ptr, 0); if (memc.flags.binary_protocol) { rc= binary_stats_fetch(memc_stat, args, args_length, instance, NULL); @@ -634,68 +640,72 @@ 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. */ -char ** memcached_stat_get_keys(memcached_st *ptr, +char ** memcached_stat_get_keys(memcached_st *memc, memcached_stat_st *, memcached_return_t *error) { - if (ptr == NULL) + if (memc) { - return NULL; - } + char **list= static_cast(libmemcached_malloc(memc, sizeof(memcached_stat_keys))); + if (list == NULL) + { + if (error) + { + *error= memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); + } - char **list= static_cast(libmemcached_malloc(ptr, sizeof(memcached_stat_keys))); - if (not list) - { - *error= memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); - return NULL; - } + return NULL; + } - memcpy(list, memcached_stat_keys, sizeof(memcached_stat_keys)); + memcpy(list, memcached_stat_keys, sizeof(memcached_stat_keys)); - *error= MEMCACHED_SUCCESS; + if (error) + { + *error= MEMCACHED_SUCCESS; + } + + return list; + } - return list; + return NULL; } void memcached_stat_free(const memcached_st *, memcached_stat_st *memc_stat) { WATCHPOINT_ASSERT(memc_stat); // Be polite, but when debugging catch this as an error - if (memc_stat == NULL) - { - return; - } - - if (memc_stat->root) + if (memc_stat) { libmemcached_free(memc_stat->root, memc_stat); - return; } - - libmemcached_free(NULL, memc_stat); } -static memcached_return_t call_stat_fn(memcached_st *ptr, - memcached_server_write_instance_st instance, +static memcached_return_t call_stat_fn(memcached_st *memc, + org::libmemcached::Instance* instance, void *context) { - memcached_return_t rc; - local_context *check= (struct local_context *)context; - - if (memcached_is_binary(ptr)) - { - rc= binary_stats_fetch(NULL, check->args, check->args_length, instance, check); - } - else + if (memc) { - rc= ascii_stats_fetch(NULL, check->args, check->args_length, instance, check); + local_context *check= (struct local_context *)context; + + if (memcached_is_binary(memc)) + { + return binary_stats_fetch(NULL, check->args, check->args_length, instance, check); + } + else + { + return ascii_stats_fetch(NULL, check->args, check->args_length, instance, check); + } } - return rc; + return MEMCACHED_INVALID_ARGUMENTS; } memcached_return_t memcached_stat_execute(memcached_st *memc, const char *args, memcached_stat_fn func, void *context) { - memcached_version(memc); + if (memcached_fatal(memcached_version(memc))) + { + return memcached_last_error(memc); + } local_context check(func, context, args, args ? strlen(args) : 0);