X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_stats.c;h=a2dc17a3e0e56fc0a444893c103fa673b3eb996e;hb=46f12a5edfa0fc0382a9d25355b15d30f857b138;hp=ed2c0e20ffc2d4d7577ae57184eeb3b13e89f236;hpb=806525899ce3dff894b829416307a4290cd882e2;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_stats.c b/lib/memcached_stats.c
index ed2c0e20..a2dc17a3 100644
--- a/lib/memcached_stats.c
+++ b/lib/memcached_stats.c
@@ -1,7 +1,7 @@
 /*
 */
 
-#include <memcached.h>
+#include "common.h"
 
 static char *memcached_stat_keys[] = {
   "pid",
@@ -152,9 +152,6 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
   char buffer[SMALL_STRING_LEN];
   *error= MEMCACHED_SUCCESS;
 
-
-  memset(buffer, 0, SMALL_STRING_LEN);
-
   if (!memcmp("pid", key, strlen("pid")))
     snprintf(buffer, SMALL_STRING_LEN,"%u", stat->pid);
   else if (!memcmp("uptime", key, strlen("uptime")))
@@ -222,42 +219,39 @@ static memcached_return memcached_stats_fetch(memcached_st *ptr,
                                               unsigned int server_key)
 {
   memcached_return rc;
-  char buffer[HUGE_STRING_LEN];
-  size_t send_length, sent_length;
+  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  size_t send_length;
 
-  rc= memcached_connect(ptr);
+  rc= memcached_connect(ptr, server_key);
 
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
   if (args)
-    send_length= snprintf(buffer, HUGE_STRING_LEN, 
+    send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                           "stats %s\r\n", args);
   else
-    send_length= snprintf(buffer, HUGE_STRING_LEN, 
+    send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                           "stats\r\n");
 
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
-  sent_length= write(ptr->hosts[server_key].fd, buffer, send_length);
-
-  if (sent_length == -1 || sent_length != send_length)
-    return MEMCACHED_WRITE_FAILURE;
-
-  rc= memcached_response(ptr, buffer, HUGE_STRING_LEN, 0);
+  rc= memcached_do(ptr, server_key, buffer, send_length, 1);
+  if (rc != MEMCACHED_SUCCESS)
+      goto error;
 
-  if (rc == MEMCACHED_SUCCESS)
+  while (1)
   {
-    char *string_ptr, *end_ptr;
-    char *key, *value;
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
 
-    string_ptr= buffer;
-    while (1)
+    if (rc == MEMCACHED_STAT)
     {
-      if (memcmp(string_ptr, "STAT ", 5))
-        break;
-      string_ptr+= 5;
+      char *string_ptr, *end_ptr;
+      char *key, *value;
+
+      string_ptr= buffer;
+      string_ptr+= 5; /* Move past STAT */
       for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
       key= string_ptr;
       key[(size_t)(end_ptr-string_ptr)]= 0;
@@ -269,9 +263,15 @@ static memcached_return memcached_stats_fetch(memcached_st *ptr,
       string_ptr= end_ptr + 2;
       set_data(stat, key, value);
     }
+    else
+      break;
   }
 
-  return rc;
+error:
+  if (rc == MEMCACHED_END)
+    return MEMCACHED_SUCCESS;
+  else
+    return rc;
 }
 
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error)
@@ -280,13 +280,6 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
   memcached_return rc;
   memcached_stat_st *stats;
 
-  rc= memcached_connect(ptr);
-  if (rc != MEMCACHED_SUCCESS)
-  {
-    *error= rc;
-    return NULL;
-  }
-
   stats= (memcached_stat_st *)malloc(sizeof(memcached_st)*(ptr->number_of_hosts+1));
   if (!stats)
   {
@@ -296,10 +289,12 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
   }
   memset(stats, 0, sizeof(memcached_st)*(ptr->number_of_hosts+1));
 
+  rc= MEMCACHED_SUCCESS;
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    rc= memcached_stats_fetch(ptr, stats+x, args, x);
-    if (rc != MEMCACHED_SUCCESS)
+    memcached_return temp_return;
+    temp_return= memcached_stats_fetch(ptr, stats+x, args, x);
+    if (temp_return != MEMCACHED_SUCCESS)
       rc= MEMCACHED_SOME_ERRORS;
   }
 
@@ -313,18 +308,13 @@ memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
   memcached_return rc;
   memcached_st memc;
 
-  memcached_init(&memc);
+  memcached_create(&memc);
 
   memcached_server_add(&memc, hostname, port);
 
-  rc= memcached_connect(&memc);
-
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
-
   rc= memcached_stats_fetch(&memc, stat, args, 0);
 
-  memcached_deinit(&memc);
+  memcached_free(&memc);
 
   return rc;
 }
@@ -338,6 +328,8 @@ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
 {
   char **list= (char **)malloc(sizeof(memcached_stat_keys));
 
+  memset(list, 0, sizeof(memcached_stat_keys));
+
   if (!list)
   {
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
@@ -350,3 +342,8 @@ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
 
   return list;
 }
+
+void memcached_stat_free(memcached_st *ptr, memcached_stat_st *stat)
+{
+  free(stat);
+}