Added buffered IO to write calls

[m6w6/libmemcached] / lib / memcached_storage.c

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 484341c842c286ad2dd8fd106cc5ebfe328f70e7..0c27c76681fdfc310c39bf99488decaec842becc 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -7,7 +7,8 @@
 
 */
 
-#include <memcached.h>
+#include "common.h"
+#include "memcached_io.h"
 
 static memcached_return memcached_send(memcached_st *ptr, 
                                        char *key, size_t key_length, 
@@ -22,39 +23,81 @@ static memcached_return memcached_send(memcached_st *ptr,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  rc= memcached_connect(ptr);
   assert(value);
   assert(value_length);
 
+  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+
+  rc= memcached_connect(ptr);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
+  assert(ptr->write_buffer_offset == 0);
+
   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,
                         (int)key_length, key, flags, 
                         (unsigned long long)expiration, value_length);
-  if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
-    return MEMCACHED_WRITE_FAILURE;
+  if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
+
+  if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length)) == -1)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
   assert(write_length == sent_length);
 
-  if ((sent_length= write(ptr->hosts[server_key].fd, value, value_length)) == -1)
+  /* 
+    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_flush(ptr, server_key)) == -1)
     return MEMCACHED_WRITE_FAILURE;
+
+  if ((sent_length= memcached_io_write(ptr, server_key, value, value_length)) == -1)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
   assert(value_length == sent_length);
 
-  if ((sent_length= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
-    return MEMCACHED_WRITE_FAILURE;
+  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2)) == -1)
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
+
   assert(2 == sent_length);
 
-  sent_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  if ((sent_length= memcached_io_flush(ptr, server_key)) == -1)
+    return MEMCACHED_WRITE_FAILURE;
+
+  //assert(sent_length == write_length + value_length + 2);
+
+  sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
 
   if (sent_length && buffer[0] == 'S')  /* STORED */
     return MEMCACHED_SUCCESS;
   else if (write_length && buffer[0] == 'N')  /* NOT_STORED */
     return MEMCACHED_NOTSTORED;
+  else if (write_length && buffer[0] == 'E')  /* ERROR */
+  {
+    printf("BUFFER :%s:\n", buffer);
+    return MEMCACHED_PROTOCOL_ERROR;
+  }
   else
     return MEMCACHED_READ_FAILURE;
+
+error:
+  memcached_io_reset(ptr, server_key);
+
+  return rc;
 }
 
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 
@@ -62,8 +105,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,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_SET_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "set");
+  LIBMEMCACHED_MEMCACHED_SET_END();
+  return rc;
 }
 
 memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
@@ -71,8 +118,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,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_ADD_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "add");
+  LIBMEMCACHED_MEMCACHED_ADD_END();
+  return rc;
 }
 
 memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length,
@@ -80,6 +131,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,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_REPLACE_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "replace");
+  LIBMEMCACHED_MEMCACHED_REPLACE_END();
+  return rc;
 }