Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / do.cc

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 928e327292d374de487e8e75845734380e77651e..2ce64483485a92c08da9c46a5d4cf2be49eb2235 100644 (file)
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,20 +11,19 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
-                                 const struct libmemcached_io_vector_st *vector,
+memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+                                 libmemcached_io_vector_st vector[],
                                  const size_t count,
                                  const bool with_flush)
 {
   memcached_return_t rc;
 
-  WATCHPOINT_ASSERT(count);
-  WATCHPOINT_ASSERT(vector);
+  assert_msg(vector, "Invalid vector passed");
 
-  if (memcached_failed(rc= memcached_connect(ptr)))
+  if (memcached_failed(rc= memcached_connect(instance)))
   {
     WATCHPOINT_ERROR(rc);
-    assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
+    assert_msg(instance->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
     return rc;
   }
 
@@ -33,17 +32,47 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
   ** before they start writing, if there is any data in buffer, clear it out,
   ** otherwise we might get a partial write.
   **/
-  if (memcached_is_udp(ptr->root) and with_flush and ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+  if (memcached_is_udp(instance->root))
   {
-    if (memcached_io_write(ptr) == false)
+    if (vector[0].buffer or vector[0].length)
     {
-      memcached_io_reset(ptr);
-      return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+      return memcached_set_error(*instance->root, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT, 
+                                 memcached_literal_param("UDP messages was attempted, but vector was not setup for it"));
+    }
+
+    struct msghdr msg;
+    memset(&msg, 0, sizeof(msg));
+
+    increment_udp_message_id(instance);
+    vector[0].buffer= instance->write_buffer;
+    vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
+
+    msg.msg_iov= (struct iovec*)vector;
+    msg.msg_iovlen= count;
+
+    uint32_t retry= 5;
+    while (--retry)
+    {
+      ssize_t sendmsg_length= ::sendmsg(instance->fd, &msg, 0);
+      if (sendmsg_length > 0)
+      {
+        break;
+      }
+      else if (sendmsg_length < 0)
+      {
+        if (errno == EMSGSIZE)
+        {
+          return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+        }
+
+        return memcached_set_errno(*instance, errno, MEMCACHED_AT);
+      }
     }
-  }
 
-  ssize_t sent_length= memcached_io_writev(ptr, vector, count, with_flush);
+    return MEMCACHED_SUCCESS;
+  }
 
+  ssize_t sent_length= memcached_io_writev(instance, vector, count, with_flush);
   size_t command_length= 0;
   for (uint32_t x= 0; x < count; ++x, vector++)
   {
@@ -52,13 +81,18 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
 
   if (sent_length == -1 or size_t(sent_length) != command_length)
   {
-    rc= MEMCACHED_WRITE_FAILURE;
-    WATCHPOINT_ERROR(rc);
-    WATCHPOINT_ERRNO(errno);
+    if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
+    {
+      return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    }
+    else
+    {
+      rc= MEMCACHED_WRITE_FAILURE;
+    }
   }
-  else if ((ptr->root->flags.no_reply) == 0)
+  else if (memcached_is_replying(instance->root))
   {
-    memcached_server_response_increment(ptr);
+    memcached_server_response_increment(instance);
   }
 
   return rc;