X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=957c5b615a28b2f6a1c56dc3ecf53ff4d18dbadd;hb=ad62715a7d4dc200a9b77ae61fc62a4a896a865f;hp=e5f9a20f3eb1df41ba76eb56458fc724bfd8050d;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=m6w6%2Flibmemcached

diff --git a/libmemcached/stats.c b/libmemcached/stats.c
index e5f9a20f..957c5b61 100644
--- a/libmemcached/stats.c
+++ b/libmemcached/stats.c
@@ -33,7 +33,7 @@ static const char *memcached_stat_keys[] = {
 static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char *value)
 {
 
-  if (strlen(key) < 1) 
+  if (strlen(key) < 1)
   {
     WATCHPOINT_STRING(key);
     return MEMCACHED_UNKNOWN_STAT_KEY;
@@ -79,7 +79,7 @@ static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char
   }
   else if (!strcmp("curr_items", key))
   {
-    memc_stat->curr_items= (uint32_t) strtol(value, (char **)NULL, 10); 
+    memc_stat->curr_items= (uint32_t) strtol(value, (char **)NULL, 10);
   }
   else if (!strcmp("total_items", key))
   {
@@ -149,7 +149,9 @@ static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char
              strcmp("cmd_flush", key) == 0 ||
              strcmp("accepting_conns", key) == 0 ||
              strcmp("listen_disabled_num", key) == 0 ||
-             strcmp("conn_yields", key) == 0))
+             strcmp("conn_yields", key) == 0 ||
+             strcmp("auth_cmds", key) == 0 ||
+             strcmp("auth_errors", key) == 0))
   {
     WATCHPOINT_STRING(key);
     return MEMCACHED_UNKNOWN_STAT_KEY;
@@ -158,7 +160,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(memcached_st *ptr, memcached_stat_st *memc_stat,
                                const char *key, memcached_return_t *error)
 {
   char buffer[SMALL_STRING_LEN];
@@ -237,7 +239,7 @@ static memcached_return_t binary_stats_fetch(memcached_st *ptr,
   request.message.header.request.opcode= PROTOCOL_BINARY_CMD_STAT;
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
-  if (args != NULL) 
+  if (args != NULL)
   {
     size_t len= strlen(args);
 
@@ -248,9 +250,9 @@ 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, 
+    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)) 
+        (memcached_io_write(&ptr->hosts[server_key], args, len, 1) == -1))
     {
       memcached_io_reset(&ptr->hosts[server_key]);
       return MEMCACHED_WRITE_FAILURE;
@@ -258,23 +260,23 @@ static memcached_return_t binary_stats_fetch(memcached_st *ptr,
   }
   else
   {
-    if (memcached_do(&ptr->hosts[server_key], request.bytes, 
-                     sizeof(request.bytes), 1) != MEMCACHED_SUCCESS) 
+    if (memcached_do(&ptr->hosts[server_key], request.bytes,
+                     sizeof(request.bytes), 1) != MEMCACHED_SUCCESS)
     {
       memcached_io_reset(&ptr->hosts[server_key]);
       return MEMCACHED_WRITE_FAILURE;
     }
   }
 
-  memcached_server_response_decrement(&ptr->hosts[server_key]);  
-  do 
+  memcached_server_response_decrement(&ptr->hosts[server_key]);
+  do
   {
-    rc= memcached_response(&ptr->hosts[server_key], buffer, 
+    rc= memcached_response(&ptr->hosts[server_key], buffer,
                            sizeof(buffer), NULL);
     if (rc == MEMCACHED_END)
       break;
 
-    unlikely (rc != MEMCACHED_SUCCESS) 
+    unlikely (rc != MEMCACHED_SUCCESS)
     {
       memcached_io_reset(&ptr->hosts[server_key]);
       return rc;
@@ -305,10 +307,10 @@ static memcached_return_t ascii_stats_fetch(memcached_st *ptr,
   size_t 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 %s\r\n", args);
   else
-    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)
@@ -367,7 +369,9 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
     return NULL;
   }
 
-  stats= ptr->call_calloc(ptr, ptr->number_of_hosts, sizeof(memcached_stat_st));
+  stats= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
+
+  stats->root= ptr;
 
   if (!stats)
   {
@@ -376,7 +380,7 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
   }
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t temp_return;
 
@@ -393,7 +397,7 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
   return stats;
 }
 
-memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char *args, 
+memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char *args,
                                              const char *hostname, in_port_t port)
 {
   memcached_return_t rc;
@@ -415,11 +419,11 @@ memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
   return rc;
 }
 
-/* 
+/*
   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(memcached_st *ptr, memcached_stat_st *memc_stat,
                                 memcached_return_t *error)
 {
   (void) memc_stat;
@@ -449,8 +453,16 @@ void memcached_stat_free(memcached_st *ptr, memcached_stat_st *memc_stat)
     return;
   }
 
-  if (ptr)
+  if (memc_stat->root)
+  {
+    memc_stat->root->call_free(ptr, memc_stat);
+  }
+  else if (ptr)
+  {
     ptr->call_free(ptr, memc_stat);
+  }
   else
+  {
     free(memc_stat);
+  }
 }