Created a bigger buffer for write/read.

[awesomized/libmemcached] / lib / memcached_storage.c

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 353615fe8aaa55b5729c12cbdb3ea321956b53bc..9d82b56f8659244c7dfc2c16072f18a39e5b95ce 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -26,6 +26,7 @@ static memcached_return memcached_send(memcached_st *ptr,
                                        uint16_t  flags,
                                        memcached_storage_action verb)
 {
+  char to_write;
   size_t write_length;
   ssize_t sent_length;
   memcached_return rc;
@@ -35,16 +36,12 @@ static memcached_return memcached_send(memcached_st *ptr,
   assert(value);
   assert(value_length);
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
-
   /* Leaving this assert in since only a library fubar could blow this */
-  if (ptr->write_buffer_offset != 0)
-  {
-    WATCHPOINT_NUMBER(ptr->write_buffer_offset);
-  }
+#ifdef NOT_DONE
+  if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0)
+    assert(0);
+#endif
     
-  assert(ptr->write_buffer_offset == 0);
-
   server_key= memcached_generate_hash(ptr, key, key_length);
 
   rc= memcached_connect(ptr, server_key);
@@ -65,7 +62,7 @@ static memcached_return memcached_send(memcached_st *ptr,
     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, 1)) == -1)
+  if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length, 0)) == -1)
   {
     rc= MEMCACHED_WRITE_FAILURE;
     goto error;
@@ -77,7 +74,12 @@ static memcached_return memcached_send(memcached_st *ptr,
     goto error;
   }
 
-  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, 1)) == -1)
+  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+    to_write= 0;
+  else
+    to_write= 1;
+
+  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;