X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=731c1cc0a31bcad9d1bab3b8c64afa5eb3886d26;hb=a8efa12d2d90c3777f3c33347fe002884be1185d;hp=e38445ec1f5df2f37affc11aa3e401649189625e;hpb=9b767485048053ad0b4c2897a0d3784aa6e9fe10;p=awesomized%2Flibmemcached diff --git a/libmemcached/stats.c b/libmemcached/stats.c index e38445ec..731c1cc0 100644 --- a/libmemcached/stats.c +++ b/libmemcached/stats.c @@ -29,6 +29,13 @@ static const char *memcached_stat_keys[] = { NULL }; +struct local_context +{ + memcached_stat_fn func; + void *context; + const char *args; +}; + static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char *value) { @@ -151,7 +158,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("auth_errors", key) == 0)) + strcmp("auth_errors", key) == 0 || + strcmp("reclaimed", key) == 0)) { WATCHPOINT_STRING(key); return MEMCACHED_UNKNOWN_STAT_KEY; @@ -160,7 +168,7 @@ static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char return MEMCACHED_SUCCESS; } -char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, +char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_stat, const char *key, memcached_return_t *error) { char buffer[SMALL_STRING_LEN]; @@ -227,8 +235,9 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, } static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, - char *args, - memcached_server_instance_st *instance) + const char *args, + memcached_server_write_instance_st instance, + struct local_context *check) { memcached_return_t rc; @@ -249,9 +258,13 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, request.message.header.request.keylen= htons((uint16_t)len); 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, true) == -1)) + struct __write_vector_st vector[]= + { + { .length= sizeof(request.bytes), .buffer= request.bytes }, + { .length= len, .buffer= args } + }; + + if (memcached_vdo(instance, vector, 2, true) != MEMCACHED_SUCCESS) { memcached_io_reset(instance); return MEMCACHED_WRITE_FAILURE; @@ -260,7 +273,7 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, 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; @@ -270,8 +283,8 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, memcached_server_response_decrement(instance); do { - rc= memcached_response(instance, buffer, - sizeof(buffer), NULL); + rc= memcached_response(instance, buffer, sizeof(buffer), NULL); + if (rc == MEMCACHED_END) break; @@ -281,10 +294,23 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, return rc; } - unlikely((set_data(memc_stat, buffer, buffer + strlen(buffer) + 1)) == MEMCACHED_UNKNOWN_STAT_KEY) + if (memc_stat) + { + unlikely((set_data(memc_stat, buffer, buffer + strlen(buffer) + 1)) == MEMCACHED_UNKNOWN_STAT_KEY) + { + WATCHPOINT_ERROR(MEMCACHED_UNKNOWN_STAT_KEY); + WATCHPOINT_ASSERT(0); + } + } + + if (check && check->func) { - WATCHPOINT_ERROR(MEMCACHED_UNKNOWN_STAT_KEY); - WATCHPOINT_ASSERT(0); + size_t key_length= strlen(buffer); + + check->func(instance, + buffer, key_length, + buffer+key_length+1, strlen(buffer+key_length+1), + check->context); } } while (1); @@ -297,8 +323,9 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat, } static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat, - char *args, - memcached_server_instance_st *instance) + const char *args, + memcached_server_write_instance_st instance, + struct local_context *check) { memcached_return_t rc; char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; @@ -314,7 +341,7 @@ static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat, 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; @@ -338,10 +365,21 @@ static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat, value= string_ptr; value[(size_t)(end_ptr-string_ptr)]= 0; string_ptr= end_ptr + 2; - unlikely((set_data(memc_stat, key, value)) == MEMCACHED_UNKNOWN_STAT_KEY) + if (memc_stat) { - WATCHPOINT_ERROR(MEMCACHED_UNKNOWN_STAT_KEY); - WATCHPOINT_ASSERT(0); + unlikely((set_data(memc_stat, key, value)) == MEMCACHED_UNKNOWN_STAT_KEY) + { + WATCHPOINT_ERROR(MEMCACHED_UNKNOWN_STAT_KEY); + WATCHPOINT_ASSERT(0); + } + } + + if (check && check->func) + { + check->func(instance, + key, strlen(key), + value, strlen(value), + check->context); } } else @@ -378,7 +416,7 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur for (uint32_t x= 0; x < memcached_server_count(ptr); x++) { memcached_return_t temp_return; - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; memcached_stat_st *stat_instance; stat_instance= stats + x; @@ -389,11 +427,11 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur if (ptr->flags.binary_protocol) { - temp_return= binary_stats_fetch(stat_instance, args, instance); + temp_return= binary_stats_fetch(stat_instance, args, instance, NULL); } else { - temp_return= ascii_stats_fetch(stat_instance, args, instance); + temp_return= ascii_stats_fetch(stat_instance, args, instance, NULL); } if (temp_return != MEMCACHED_SUCCESS) @@ -410,7 +448,9 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char memcached_return_t rc; memcached_st memc; memcached_st *memc_ptr; - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; + + memset(memc_stat, 0, sizeof(memcached_stat_st)); memc_ptr= memcached_create(&memc); WATCHPOINT_ASSERT(memc_ptr); @@ -421,11 +461,11 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char if (memc.flags.binary_protocol) { - rc= binary_stats_fetch(memc_stat, args, instance); + rc= binary_stats_fetch(memc_stat, args, instance, NULL); } else { - rc= ascii_stats_fetch(memc_stat, args, instance); + rc= ascii_stats_fetch(memc_stat, args, instance, NULL); } memcached_free(&memc); @@ -437,7 +477,7 @@ 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(const memcached_st *ptr, memcached_stat_st *memc_stat, memcached_return_t *error) { @@ -461,7 +501,7 @@ char ** memcached_stat_get_keys(memcached_st *ptr, return list; } -void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat) +void memcached_stat_free(const memcached_st *ptr, memcached_stat_st *memc_stat) { if (memc_stat == NULL) { @@ -482,3 +522,31 @@ void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat) free(memc_stat); } } + +static memcached_return_t call_stat_fn(memcached_st *ptr, + memcached_server_write_instance_st instance, + void *context) +{ + memcached_return_t rc; + struct local_context *check= (struct local_context *)context; + + if (ptr->flags.binary_protocol) + { + rc= binary_stats_fetch(NULL, check->args, instance, check); + } + else + { + rc= ascii_stats_fetch(NULL, check->args, instance, check); + } + + return rc; +} + +memcached_return_t memcached_stat_execute(memcached_st *memc, const char *args, memcached_stat_fn func, void *context) +{ + memcached_version(memc); + + struct local_context check= { .func= func, .context= context, .args= args }; + + return memcached_server_execute(memc, call_stat_fn, (void *)&check); +}