X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=f9ba64d6db358467523f1098417c63d427c57bbe;hb=1bd637f6eccc1064a4e19e40b14a340818d1ccf3;hp=fc3c3cbab73f199e0e0fce477f1dc690a2c735bd;hpb=85a66fec1e07e874e5410ce56a2976d68fbe14fd;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index fc3c3cba..f9ba64d6 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -26,26 +26,28 @@ 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;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  assert(value);
-  assert(value_length);
+  WATCHPOINT_ASSERT(value);
+  WATCHPOINT_ASSERT(value_length);
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  /* 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);
+  rc= memcached_connect(ptr, server_key);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  /* Leaveing this assert in since only a library fubar could blow this */
-  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", storage_op_string(verb),
                         (int)key_length, key, flags, 
@@ -60,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;
@@ -72,8 +74,14 @@ 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;
     goto error;
   }
@@ -81,7 +89,7 @@ static memcached_return memcached_send(memcached_st *ptr,
   if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
   {
     rc= MEMCACHED_SUCCESS;
-    ptr->stack_responses++;
+    memcached_server_response_increment(ptr, server_key);
   }
   else
   {