X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=f9ba64d6db358467523f1098417c63d427c57bbe;hb=583fff6ac27c305e31e2b4b906f4e0702e26fee6;hp=499fb7c8e947e18f76e5fda784a5c2a90d361534;hpb=ccd00450d57624afba24bfbb6e76d1d69d0ad0f8;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 499fb7c8..f9ba64d6 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -7,56 +7,104 @@
 
 */
 
-#include <memcached.h>
+#include "common.h"
+#include "memcached_io.h"
+
+typedef enum {
+  SET_OP,
+  REPLACE_OP,
+  ADD_OP,
+} memcached_storage_action;
+
+/* Inline this */
+#define storage_op_string(A) A == SET_OP ? "set" : ( A == REPLACE_OP ? "replace" : "add")
 
 static memcached_return memcached_send(memcached_st *ptr, 
                                        char *key, size_t key_length, 
                                        char *value, size_t value_length, 
                                        time_t expiration,
                                        uint16_t  flags,
-                                       char *verb)
+                                       memcached_storage_action verb)
 {
+  char to_write;
   size_t write_length;
   ssize_t sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  assert(value);
-  assert(value_length);
+  WATCHPOINT_ASSERT(value);
+  WATCHPOINT_ASSERT(value_length);
 
-  rc= memcached_connect(ptr);
+  /* Leaving this WATCHPOINT_ASSERT in since only a library fubar could blow this */
+#ifdef NOT_DONE
+  if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0)
+    WATCHPOINT_ASSERT(0);
+#endif
+    
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
+  rc= memcached_connect(ptr, server_key);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
   write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%s %.*s %x %llu %zu\r\n", verb,
+                        "%s %.*s %x %llu %zu\r\n", storage_op_string(verb),
                         (int)key_length, key, flags, 
                         (unsigned long long)expiration, value_length);
   if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-    return MEMCACHED_WRITE_FAILURE;
-  if ((sent_length= send(ptr->hosts[server_key].fd, buffer, write_length, 0)) == -1)
-    return MEMCACHED_WRITE_FAILURE;
-  assert(write_length == sent_length);
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-  if ((sent_length= send(ptr->hosts[server_key].fd, value, value_length, 0)) == -1)
-    return MEMCACHED_WRITE_FAILURE;
-  assert(value_length == sent_length);
+  /* 
+    We have to flush after sending the command. Memcached is not smart enough
+    to just keep reading from the socket :(
+  */
+  if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length, 0)) == -1)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-  if ((sent_length= send(ptr->hosts[server_key].fd, "\r\n", 2, 0)) == -1)
-    return MEMCACHED_WRITE_FAILURE;
-  assert(2 == sent_length);
+  if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-  sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
+  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+    to_write= 0;
+  else
+    to_write= 1;
 
-  if (sent_length && buffer[0] == 'S')  /* STORED */
-    return MEMCACHED_SUCCESS;
-  else if (write_length && buffer[0] == 'N')  /* NOT_STORED */
-    return MEMCACHED_NOTSTORED;
+  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
+  {
+    memcached_quit_server(ptr, server_key);
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
+
+  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+  {
+    rc= MEMCACHED_SUCCESS;
+    memcached_server_response_increment(ptr, server_key);
+  }
   else
-    return MEMCACHED_READ_FAILURE;
+  {
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  }
+
+  if (rc == MEMCACHED_STORED)
+    return MEMCACHED_SUCCESS;
+  else 
+    return rc;
+
+error:
+  memcached_io_reset(ptr, server_key);
+
+  return rc;
 }
 
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 
@@ -64,8 +112,12 @@ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,
                                time_t expiration,
                                uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, "set");
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_SET_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
+                         expiration, flags, SET_OP);
+  LIBMEMCACHED_MEMCACHED_SET_END();
+  return rc;
 }
 
 memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
@@ -73,8 +125,12 @@ memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
                                time_t expiration,
                                uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, "add");
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_ADD_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
+                         expiration, flags, ADD_OP);
+  LIBMEMCACHED_MEMCACHED_ADD_END();
+  return rc;
 }
 
 memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length,
@@ -82,6 +138,10 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
                                    time_t expiration,
                                    uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, "replace");
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_REPLACE_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
+                         expiration, flags, REPLACE_OP);
+  LIBMEMCACHED_MEMCACHED_REPLACE_END();
+  return rc;
 }