X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_stats.c;h=a1ef99f3a945b374bdf7b5ad1d3bbc05e7da4a26;hb=5ed23cb1d7aaa03f05b58dfeabeee72f5aff91c5;hp=644ca70d41d24f722731cab263a73482f6c7202e;hpb=85a66fec1e07e874e5410ce56a2976d68fbe14fd;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_stats.c b/lib/memcached_stats.c
index 644ca70d..a1ef99f3 100644
--- a/lib/memcached_stats.c
+++ b/lib/memcached_stats.c
@@ -11,10 +11,6 @@ static char *memcached_stat_keys[] = {
   "pointer_size",
   "rusage_user",
   "rusage_system",
-  "rusage_user_seconds",
-  "rusage_user_microseconds",
-  "rusage_system_seconds",
-  "rusage_system_microseconds",
   "curr_items",
   "total_items",
   "bytes",
@@ -36,107 +32,107 @@ static char *memcached_stat_keys[] = {
 
 static void set_data(memcached_stat_st *stat, char *key, char *value)
 {
-  if (!memcmp("pid", key, strlen("pid")))
-  {
-    stat->pid= strtol(value, (char **)NULL, 10);
-  }
-  else if (!memcmp("uptime", key, strlen("uptime")))
-  {
-    stat->uptime= strtol(value, (char **)NULL, 10);
-  }
-  else if (!memcmp("time", key, strlen("time")))
-  {
-    stat->time= strtoll(value, (char **)NULL, 10);
-  }
-  else if (!memcmp("version", key, strlen("version")))
+
+  if(strlen(key) < 1) 
   {
-    memcpy(stat->version, value, 8);
+    fprintf(stderr, "Invalid key %s\n", key);
   }
-  else if (!memcmp("pointer_size", key, strlen("pointer_size")))
+  else if (!strcmp("pid", key))
   {
-    stat->pointer_size= strtoll(value, (char **)NULL, 10);
+    stat->pid= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("rusage_user", key, strlen("rusage_user")))
+  else if (!strcmp("uptime", key))
   {
-    stat->rusage_user= strtoll(value, (char **)NULL, 10);
+    stat->uptime= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("rusage_system", key, strlen("rusage_system")))
+  else if (!strcmp("time", key))
   {
-    stat->rusage_system= strtoll(value, (char **)NULL, 10);
+    stat->time= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("rusage_user_seconds", key, strlen("rusage_user_seconds")))
+  else if (!strcmp("version", key))
   {
-    stat->rusage_user_seconds= strtoll(value, (char **)NULL, 10);
+    memcpy(stat->version, value, strlen(value));
+    stat->version[strlen(value)]= 0;
   }
-  else if (!memcmp("rusage_user_microseconds", key, strlen("rusage_user_microseconds")))
+  else if (!strcmp("pointer_size", key))
   {
-    stat->rusage_user_microseconds= strtoll(value, (char **)NULL, 10);
+    stat->pointer_size= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("rusage_system_seconds", key, strlen("rusage_system_seconds")))
+  else if (!strcmp("rusage_user", key))
   {
-    stat->rusage_system_seconds= strtoll(value, (char **)NULL, 10);
+    char *walk_ptr;
+    for (walk_ptr= value; (!ispunct(*walk_ptr)); walk_ptr++);
+    *walk_ptr= 0;
+    walk_ptr++;
+    stat->rusage_user_seconds= strtol(value, (char **)NULL, 10);
+    stat->rusage_user_microseconds= strtol(walk_ptr, (char **)NULL, 10);
   }
-  else if (!memcmp("rusage_system_microseconds", key, strlen("rusage_system_microseconds")))
+  else if (!strcmp("rusage_system", key))
   {
-    stat->rusage_system_microseconds= strtoll(value, (char **)NULL, 10);
+    char *walk_ptr;
+    for (walk_ptr= value; (!ispunct(*walk_ptr)); walk_ptr++);
+    *walk_ptr= 0;
+    walk_ptr++;
+    stat->rusage_system_seconds= strtol(value, (char **)NULL, 10);
+    stat->rusage_system_microseconds= strtol(walk_ptr, (char **)NULL, 10);
   }
-  else if (!memcmp("curr_items", key, strlen("curr_items")))
+  else if (!strcmp("curr_items", key))
   {
-    stat->curr_items= strtoll(value, (char **)NULL, 10);
+    stat->curr_items= strtol(value, (char **)NULL, 10); 
   }
-  else if (!memcmp("total_items", key, strlen("total_items")))
+  else if (!strcmp("total_items", key))
   {
-    stat->total_items= strtoll(value, (char **)NULL, 10);
+    stat->total_items= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("bytes", key, strlen("bytes")))
+  else if (!strcmp("bytes", key))
   {
     stat->bytes= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("curr_connections", key, strlen("curr_connections")))
+  else if (!strcmp("curr_connections", key))
   {
     stat->curr_connections= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("total_connections", key, strlen("total_connections")))
+  else if (!strcmp("total_connections", key))
   {
     stat->total_connections= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("connection_structures", key, strlen("connection_structures")))
+  else if (!strcmp("connection_structures", key))
   {
-    stat->connection_structures= strtoll(value, (char **)NULL, 10);
+    stat->connection_structures= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("cmd_get", key, strlen("cmd_get")))
+  else if (!strcmp("cmd_get", key))
   {
     stat->cmd_get= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("cmd_set", key, strlen("cmd_set")))
+  else if (!strcmp("cmd_set", key))
   {
     stat->cmd_set= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("get_hits", key, strlen("get_hits")))
+  else if (!strcmp("get_hits", key))
   {
     stat->get_hits= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("get_misses", key, strlen("get_misses")))
+  else if (!strcmp("get_misses", key))
   {
-    stat->get_misses= strtoll(value, (char **)NULL, 10);
+    stat->get_misses= (uint64_t)strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("evictions", key, strlen("evictions")))
+  else if (!strcmp("evictions", key))
   {
-    stat->evictions= strtoll(value, (char **)NULL, 10);
+    stat->evictions= (uint64_t)strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("bytes_read", key, strlen("bytes_read")))
+  else if (!strcmp("bytes_read", key))
   {
     stat->bytes_read= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("bytes_written", key, strlen("bytes_written")))
+  else if (!strcmp("bytes_written", key))
   {
     stat->bytes_written= strtoll(value, (char **)NULL, 10);
   }
-  else if (!memcmp("limit_maxbytes", key, strlen("limit_maxbytes")))
+  else if (!strcmp("limit_maxbytes", key))
   {
-    stat->limit_maxbytes= strtoll(value, (char **)NULL, 10);
+    stat->limit_maxbytes= strtol(value, (char **)NULL, 10);
   }
-  else if (!memcmp("threads", key, strlen("threads")))
+  else if (!strcmp("threads", key))
   {
     stat->threads= strtol(key, (char **)NULL, 10);
   }
@@ -150,70 +146,69 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
                                char *key, memcached_return *error)
 {
   char buffer[SMALL_STRING_LEN];
-  *error= MEMCACHED_SUCCESS;
+  size_t length;
+  char *ret;
 
-
-  memset(buffer, 0, SMALL_STRING_LEN);
+  *error= MEMCACHED_SUCCESS;
 
   if (!memcmp("pid", key, strlen("pid")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->pid);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->pid);
   else if (!memcmp("uptime", key, strlen("uptime")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->uptime);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->uptime);
   else if (!memcmp("time", key, strlen("time")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->time);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->time);
   else if (!memcmp("version", key, strlen("version")))
-    snprintf(buffer, SMALL_STRING_LEN,"%s", stat->version);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%s", stat->version);
   else if (!memcmp("pointer_size", key, strlen("pointer_size")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->pointer_size);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->pointer_size);
   else if (!memcmp("rusage_user", key, strlen("rusage_user")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_user);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", stat->rusage_user_seconds, stat->rusage_user_microseconds);
   else if (!memcmp("rusage_system", key, strlen("rusage_system")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_system);
-  else if (!memcmp("rusage_user_seconds", key, strlen("rusage_user_seconds")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_user_seconds);
-  else if (!memcmp("rusage_user_microseconds", key, strlen("rusage_user_microseconds")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_user_microseconds);
-  else if (!memcmp("rusage_system_seconds", key, strlen("rusage_system_seconds")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_system_seconds);
-  else if (!memcmp("rusage_system_microseconds", key, strlen("rusage_system_microseconds")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->rusage_system_microseconds);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", stat->rusage_system_seconds, stat->rusage_system_microseconds);
   else if (!memcmp("curr_items", key, strlen("curr_items")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->curr_items);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->curr_items);
   else if (!memcmp("total_items", key, strlen("total_items")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->total_items);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->total_items);
   else if (!memcmp("bytes", key, strlen("bytes")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->bytes);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->bytes);
   else if (!memcmp("curr_connections", key, strlen("curr_connections")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->curr_connections);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->curr_connections);
   else if (!memcmp("total_connections", key, strlen("total_connections")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->total_connections);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->total_connections);
   else if (!memcmp("connection_structures", key, strlen("connection_structures")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->connection_structures);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->connection_structures);
   else if (!memcmp("cmd_get", key, strlen("cmd_get")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->cmd_get);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->cmd_get);
   else if (!memcmp("cmd_set", key, strlen("cmd_set")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->cmd_set);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->cmd_set);
   else if (!memcmp("get_hits", key, strlen("get_hits")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->get_hits);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->get_hits);
   else if (!memcmp("get_misses", key, strlen("get_misses")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->get_misses);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->get_misses);
   else if (!memcmp("evictions", key, strlen("evictions")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->evictions);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->evictions);
   else if (!memcmp("bytes_read", key, strlen("bytes_read")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->bytes_read);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->bytes_read);
   else if (!memcmp("bytes_written", key, strlen("bytes_written")))
-    snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->bytes_written);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)stat->bytes_written);
   else if (!memcmp("limit_maxbytes", key, strlen("limit_maxbytes")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->limit_maxbytes);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%llu", stat->limit_maxbytes);
   else if (!memcmp("threads", key, strlen("threads")))
-    snprintf(buffer, SMALL_STRING_LEN,"%u", stat->threads);
+    length= snprintf(buffer, SMALL_STRING_LEN,"%u", stat->threads);
   else
   {
     *error= MEMCACHED_NOTFOUND;
     return NULL;
   }
 
-  return strdup(buffer);
+  if (ptr->call_malloc)
+    ret= ptr->call_malloc(ptr, length + 1);
+  else
+    ret= malloc(length + 1);
+  memcpy(ret, buffer, length);
+  ret[length]= '\0';
+
+  return ret;
 }
 
 static memcached_return memcached_stats_fetch(memcached_st *ptr,
@@ -222,56 +217,54 @@ 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;
-
-  rc= memcached_connect(ptr);
-
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
+  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  size_t send_length;
 
   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= memcached_io_write(ptr, server_key, buffer, send_length, 1);
-
-  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->hosts[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->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
-    string_ptr= buffer;
-    while (1)
+    if (rc == MEMCACHED_STAT)
     {
-      if (memcmp(string_ptr, "STAT ", 5))
-        break;
-      string_ptr+= 5;
-      for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+      char *string_ptr, *end_ptr;
+      char *key, *value;
+
+      string_ptr= buffer;
+      string_ptr+= 5; /* Move past STAT */
+      for (end_ptr= string_ptr; isgraph(*end_ptr); end_ptr++);
       key= string_ptr;
       key[(size_t)(end_ptr-string_ptr)]= 0;
 
       string_ptr= end_ptr + 1;
-      for (end_ptr= string_ptr; *end_ptr != '\r'; end_ptr++);
+      for (end_ptr= string_ptr; !(isspace(*end_ptr)); end_ptr++);
       value= string_ptr;
       value[(size_t)(end_ptr-string_ptr)]= 0;
       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,26 +273,30 @@ 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;
-  }
+  if (ptr->call_malloc)
+    stats= (memcached_stat_st *)ptr->call_malloc(ptr, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
+  else
+    stats= (memcached_stat_st *)malloc(sizeof(memcached_stat_st)*(ptr->number_of_hosts));
 
-  stats= (memcached_stat_st *)malloc(sizeof(memcached_st)*(ptr->number_of_hosts+1));
   if (!stats)
   {
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-    free(stats);
+    if (ptr->call_free)
+      ptr->call_free(ptr, stats);
+    else
+      free(stats);
+
     return NULL;
   }
-  memset(stats, 0, sizeof(memcached_st)*(ptr->number_of_hosts+1));
+  memset(stats, 0, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
 
+  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;
   }
 
@@ -317,11 +314,6 @@ memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
 
   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_free(&memc);
@@ -336,15 +328,20 @@ memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
 char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
                                 memcached_return *error)
 {
-  char **list= (char **)malloc(sizeof(memcached_stat_keys));
+  char **list;
+  size_t length= sizeof(memcached_stat_keys);
 
-  memset(list, 0, sizeof(memcached_stat_keys));
+  if (ptr->call_malloc)
+    list= (char **)ptr->call_malloc(ptr, length);
+  else
+    list= (char **)malloc(length);
 
   if (!list)
   {
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return NULL;
   }
+  memset(list, 0, sizeof(memcached_stat_keys));
 
   memcpy(list, memcached_stat_keys, sizeof(memcached_stat_keys));
 
@@ -352,3 +349,17 @@ 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)
+{
+  if (stat == NULL)
+  {
+    WATCHPOINT_ASSERT(0); /* Be polite, but when debugging catch this as an error */
+    return;
+  }
+
+  if (ptr && ptr->call_free)
+    ptr->call_free(ptr, stat);
+  else
+    free(stat);
+}