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)
{
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;
+ /* return MEMCACHED_UNKNOWN_STAT_KEY; */
+ return MEMCACHED_SUCCESS;
}
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];
*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
{
return NULL;
}
- ret= ptr->call_malloc(ptr, (size_t) (length + 1));
+ if (length >= SMALL_STRING_LEN || length < 0)
+ {
+ *error= MEMCACHED_FAILURE;
+ return NULL;
+ }
+
+ ret= libmemcached_malloc(ptr, (size_t) (length + 1));
memcpy(ret, buffer, (size_t) length);
ret[length]= '\0';
}
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;
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, 1) == -1))
+ struct libmemcached_io_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;
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;
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;
return rc;
}
- unlikely((set_data(memc_stat, buffer, buffer + strlen(buffer) + 1)) == MEMCACHED_UNKNOWN_STAT_KEY)
+ if (memc_stat)
{
- WATCHPOINT_ERROR(MEMCACHED_UNKNOWN_STAT_KEY);
- WATCHPOINT_ASSERT(0);
+ 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)
+ {
+ 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);
}
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];
- size_t send_length;
+ int send_length;
if (args)
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"stats\r\n");
- if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(instance, buffer, send_length, 1);
+ rc= memcached_do(instance, buffer, (size_t)send_length, true);
if (rc != MEMCACHED_SUCCESS)
goto error;
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
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)
{
- uint32_t x;
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;
}
- stats= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
+ WATCHPOINT_ASSERT(error);
+
+ unlikely (self->flags.use_udp)
+ {
+ if (error)
+ *error= MEMCACHED_NOT_SUPPORTED;
+
+ return NULL;
+ }
- stats->root= ptr;
+ stats= libmemcached_calloc(self, memcached_server_count(self), sizeof(memcached_stat_st));
- if (!stats)
+ 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 (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_instance_st *instance;
+ memcached_server_write_instance_st instance;
+ memcached_stat_st *stat_instance;
+
+ stat_instance= stats + x;
+
+ 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(stats + x, args, instance);
+ temp_return= binary_stats_fetch(stat_instance, args, instance, NULL);
}
else
{
- temp_return= ascii_stats_fetch(stats + x, args, instance);
+ temp_return= ascii_stats_fetch(stat_instance, args, instance, NULL);
}
if (temp_return != MEMCACHED_SUCCESS)
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_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);
+ 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)
{
- 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);
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(const memcached_st *ptr,
+ memcached_stat_st *memc_stat,
memcached_return_t *error)
{
- (void) memc_stat;
char **list;
size_t length= sizeof(memcached_stat_keys);
- list= ptr->call_malloc(ptr, length);
+ (void)memc_stat;
- if (!list)
+ list= libmemcached_malloc(ptr, length);
+
+ if (! list)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
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)
{
if (memc_stat->root)
{
- memc_stat->root->call_free(ptr, memc_stat);
+ libmemcached_free(memc_stat->root, memc_stat);
}
else if (ptr)
{
- ptr->call_free(ptr, memc_stat);
+ libmemcached_free(ptr, memc_stat);
}
else
{
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);
+}
projects / awesomized / libmemcached / blobdiff