X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=ff5416d4a5aef48a2c41d97d1e9af684b5021108;hb=09ef521d2c88955d04d6c91f7b5a1671a1955130;hp=957c5b615a28b2f6a1c56dc3ecf53ff4d18dbadd;hpb=ac40b10adf3a182fe62d24899eb96c10364ba91b;p=m6w6%2Flibmemcached

diff --git a/libmemcached/stats.c b/libmemcached/stats.c
index 957c5b61..ff5416d4 100644
--- a/libmemcached/stats.c
+++ b/libmemcached/stats.c
@@ -151,7 +151,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 +161,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];
@@ -219,17 +220,16 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat,
     return NULL;
   }
 
-  ret= ptr->call_malloc(ptr, (size_t) (length + 1));
+  ret= libmemcached_malloc(ptr, (size_t) (length + 1));
   memcpy(ret, buffer, (size_t) length);
   ret[length]= '\0';
 
   return ret;
 }
 
-static memcached_return_t binary_stats_fetch(memcached_st *ptr,
-                                             memcached_stat_st *memc_stat,
+static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
                                              char *args,
-                                             unsigned int server_key)
+                                             memcached_server_write_instance_st instance)
 {
   memcached_return_t rc;
 
@@ -250,35 +250,39 @@ static memcached_return_t binary_stats_fetch(memcached_st *ptr,
     request.message.header.request.keylen= htons((uint16_t)len);
     request.message.header.request.bodylen= htonl((uint32_t) len);
 
-    if ((memcached_do(&ptr->hosts[server_key], request.bytes,
-                      sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
-        (memcached_io_write(&ptr->hosts[server_key], args, len, 1) == -1))
+    struct __write_vector_st vector[]= 
     {
-      memcached_io_reset(&ptr->hosts[server_key]);
+      { .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(&ptr->hosts[server_key], request.bytes,
-                     sizeof(request.bytes), 1) != MEMCACHED_SUCCESS)
+    if (memcached_do(instance, request.bytes,
+                     sizeof(request.bytes), true) != MEMCACHED_SUCCESS)
     {
-      memcached_io_reset(&ptr->hosts[server_key]);
+      memcached_io_reset(instance);
       return MEMCACHED_WRITE_FAILURE;
     }
   }
 
-  memcached_server_response_decrement(&ptr->hosts[server_key]);
+  memcached_server_response_decrement(instance);
   do
   {
-    rc= memcached_response(&ptr->hosts[server_key], buffer,
-                           sizeof(buffer), NULL);
+    rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
+
     if (rc == MEMCACHED_END)
       break;
 
     unlikely (rc != MEMCACHED_SUCCESS)
     {
-      memcached_io_reset(&ptr->hosts[server_key]);
+      memcached_io_reset(instance);
       return rc;
     }
 
@@ -292,15 +296,14 @@ static memcached_return_t binary_stats_fetch(memcached_st *ptr,
   /* shit... memcached_response will decrement the counter, so I need to
    ** reset it.. todo: look at this and try to find a better solution.
  */
-  ptr->hosts[server_key].cursor_active= 0;
+  instance->cursor_active= 0;
 
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return_t ascii_stats_fetch(memcached_st *ptr,
-                                            memcached_stat_st *memc_stat,
+static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
                                             char *args,
-                                            unsigned int server_key)
+                                            memcached_server_write_instance_st instance)
 {
   memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -316,13 +319,13 @@ static memcached_return_t ascii_stats_fetch(memcached_st *ptr,
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
-  rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
+  rc= memcached_do(instance, buffer, send_length, true);
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
   while (1)
   {
-    rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+    rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
     if (rc == MEMCACHED_STAT)
     {
@@ -359,7 +362,6 @@ error:
 
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error)
 {
-  unsigned int x;
   memcached_return_t rc;
   memcached_stat_st *stats;
 
@@ -369,25 +371,35 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
     return NULL;
   }
 
-  stats= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
+  stats= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
 
-  stats->root= ptr;
-
-  if (!stats)
+  if (! stats)
   {
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return NULL;
   }
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t temp_return;
+    memcached_server_write_instance_st instance;
+    memcached_stat_st *stat_instance;
+
+    stat_instance= stats + x;
+
+    stat_instance->root= ptr;
+
+    instance= memcached_server_instance_fetch(ptr, x);
 
     if (ptr->flags.binary_protocol)
-      temp_return= binary_stats_fetch(ptr, stats + x, args, x);
+    {
+      temp_return= binary_stats_fetch(stat_instance, args, instance);
+    }
     else
-      temp_return= ascii_stats_fetch(ptr, stats + x, args, x);
+    {
+      temp_return= ascii_stats_fetch(stat_instance, args, instance);
+    }
 
     if (temp_return != MEMCACHED_SUCCESS)
       rc= MEMCACHED_SOME_ERRORS;
@@ -403,16 +415,25 @@ 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_write_instance_st instance;
+
+  memset(memc_stat, 0, sizeof(memcached_stat_st));
 
   memc_ptr= memcached_create(&memc);
   WATCHPOINT_ASSERT(memc_ptr);
 
   memcached_server_add(&memc, hostname, port);
 
+  instance= memcached_server_instance_fetch(memc_ptr, 0);
+
   if (memc.flags.binary_protocol)
-    rc= binary_stats_fetch(&memc, memc_stat, args, 0);
+  {
+    rc= binary_stats_fetch(memc_stat, args, instance);
+  }
   else
-    rc= ascii_stats_fetch(&memc, memc_stat, args, 0);
+  {
+    rc= ascii_stats_fetch(memc_stat, args, instance);
+  }
 
   memcached_free(&memc);
 
@@ -423,16 +444,18 @@ 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, 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;
+
+  list= libmemcached_malloc(ptr, length);
 
-  if (!list)
+  if (! list)
   {
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return NULL;
@@ -445,7 +468,7 @@ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat,
   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)
   {
@@ -455,11 +478,11 @@ void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat)
 
   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
   {