X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_get.c;h=4d2b10d2edad397ae2efd18bba7a25d1a81b9bed;hb=257f0547823cf6b18473ba8bd2580b38235f6d79;hp=b920df3f4fd55b5162fca8a4ace8c8c24f6cea89;hpb=3e08799c9d80873a66e7e0b08c6524b0d5c47c28;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index b920df3f..4d2b10d2 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,4 +1,5 @@
-#include <memcached.h>
+#include "common.h"
+#include "memcached_io.h"
 
 static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_length, 
                                    size_t *value_length, 
@@ -9,15 +10,22 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
 {
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *string_ptr;
+  char *end_ptr;
 
-  *value_length= 0;
+  assert(value_length);
+  assert(flags);
+  assert(error);
 
   memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
+
+  *value_length= 0;
+
   *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
 
   if (*error == MEMCACHED_SUCCESS)
   {
-    char *end_ptr;
+    char *next_ptr;
 
     string_ptr= buffer;
     string_ptr+= 6; /* "VALUE " */
@@ -26,35 +34,55 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     if (load_key)
     {
       memset(key, 0, MEMCACHED_MAX_KEY);
-      for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++)
+      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
       {
-        *key= *end_ptr;
+        *key= *string_ptr;
         key++;
       }
     }
     else /* Skip characters */
-      for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
+
+    /* Flags fetch move past space */
+    string_ptr++;
+    if (end_ptr == string_ptr)
+        goto read_error;
+    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    *flags= (uint16_t)strtol(next_ptr, &string_ptr, 10);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
+
+    /* Length fetch move past space*/
+    string_ptr++;
+    if (end_ptr == string_ptr)
+        goto read_error;
 
-    /* Flags fetch */
-    string_ptr= end_ptr + 1;
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
-    *flags= (uint16_t)strtol(string_ptr, &end_ptr, 10);
+    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    *value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
 
-    /* Length fetch */
-    string_ptr= end_ptr + 1;
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
-    *value_length= strtoll(string_ptr, &end_ptr, 10);
+    if (end_ptr == string_ptr)
+        goto read_error;
 
     /* Skip past the \r\n */
-    string_ptr= end_ptr +2;
+    string_ptr+= 2;
+
+    if (end_ptr < string_ptr)
+        goto read_error;
 
     if (*value_length)
     {
       size_t read_length;
+      size_t to_read;
       char *value;
+      char *value_ptr;
 
       /* We add two bytes so that we can walk the \r\n */
       value= (char *)malloc(((*value_length) +2) * sizeof(char));
+      memset(value, 0, ((*value_length) +2) * sizeof(char));
 
       if (!value)
       {
@@ -63,21 +91,29 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
         return NULL;
       }
 
-      read_length= read(ptr->hosts[server_key].fd, value, (*value_length)+2);
+      value_ptr= value;
+      read_length= 0;
+      to_read= (*value_length) + 2;
+
+      read_length= memcached_io_read(ptr, server_key,
+                                     value_ptr, to_read);
 
-      if ((read_length -2) != *value_length)
+      if (read_length != (size_t)(*value_length + 2))
       {
         free(value);
-        *error= MEMCACHED_PARTIAL_READ;
-
-        return NULL;
+        goto read_error;
       }
 
       return value;
     }
   }
+  else if (*error == MEMCACHED_END)
+    *error= MEMCACHED_NOTFOUND;
 
   return NULL;
+read_error:
+  *error= MEMCACHED_PARTIAL_READ;
+  return NULL;
 }
 
 char *memcached_get(memcached_st *ptr, char *key, size_t key_length, 
@@ -88,28 +124,58 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   size_t send_length;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
+  char *value;
+  LIBMEMCACHED_MEMCACHED_GET_START();
 
   *value_length= 0;
   *error= memcached_connect(ptr);
 
   if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+    goto error;
 
   server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
-
-  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
   {
     *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
+    goto error;
   }
 
-  return memcached_value_fetch(ptr, key, &key_length, value_length, flags,
+  value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
                                error, 0, server_key);
+  if (*error == MEMCACHED_END && *value_length == 0)
+  {
+    *error= MEMCACHED_NOTFOUND;
+    goto error;
+  }
+  else if (*error == MEMCACHED_SUCCESS)
+  {
+    memcached_return rc;
+    /* We need to read END */
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+    if (rc != MEMCACHED_END)
+    {
+      *error= MEMCACHED_PROTOCOL_ERROR;
+      goto error;
+    }
+  }
+  else 
+      goto error;
+
+  LIBMEMCACHED_MEMCACHED_GET_END();
+
+  return value;
+
+error:
+  free(value);
+  *value_length= 0;
+
+  LIBMEMCACHED_MEMCACHED_GET_END();
+
+    return NULL;
 }
 
 memcached_return memcached_mget(memcached_st *ptr, 
@@ -120,6 +186,7 @@ memcached_return memcached_mget(memcached_st *ptr,
   unsigned int x;
   memcached_return rc;
   memcached_string_st **cursor_key_exec;
+  LIBMEMCACHED_MEMCACHED_MGET_START();
 
   ptr->cursor_server= 0;
   memset(buffer, 0, HUGE_STRING_LEN);
@@ -148,8 +215,9 @@ memcached_return memcached_mget(memcached_st *ptr,
     }
     else
     {
-      memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
+      memcached_string_st *string= memcached_string_create(ptr, SMALL_STRING_LEN);
 
+      /* We need to figure out the correct way to error in case of this failure */
       if (!string)
         assert(0);
 
@@ -171,18 +239,20 @@ memcached_return memcached_mget(memcached_st *ptr,
       memcached_string_st *string= cursor_key_exec[x];
       memcached_string_append(ptr, string, "\r\n", 2);
 
-      if ((write(ptr->hosts[x].fd, string->string, 
-                 memcached_string_length(ptr, string)) == -1))
+      if ((send(ptr->hosts[x].fd, string->string, 
+                 memcached_string_length(ptr, string), 0) == -1))
       {
         memcached_quit(ptr);
         rc= MEMCACHED_SOME_ERRORS;
       }
       memcached_string_free(ptr, string);
+      cursor_key_exec[x]= NULL; /* Remove warning */
     }
   }
 
   free(cursor_key_exec);
 
+  LIBMEMCACHED_MEMCACHED_MGET_END();
   return rc;
 }
 
@@ -200,6 +270,8 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
     
     if (*error == MEMCACHED_NOTFOUND)
       ptr->cursor_server++;
+    else if (*error != MEMCACHED_SUCCESS)
+      return NULL;
     else
       return value_check;
   }