Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-27

[awesomized/libmemcached] / libmemcached / do.cc

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index d289c479fa71b41cb7129d920c7fd77081575cac..db533680f77193f80ea3dd6ce37eb65bcb1f3639 100644 (file)
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,7 +11,7 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+memcached_return_t memcached_vdo(org::libmemcached::Instance* instance,
                                  libmemcached_io_vector_st vector[],
                                  const size_t count,
                                  const bool with_flush)
@@ -23,7 +23,7 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
   if (memcached_failed(rc= memcached_connect(instance)))
   {
     WATCHPOINT_ERROR(rc);
-    assert_msg(instance->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 Instance showed none.");
     return rc;
   }
 
@@ -40,21 +40,53 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
                                  memcached_literal_param("UDP messages was attempted, but vector was not setup for it"));
     }
 
-    return MEMCACHED_NOT_SUPPORTED;
-  }
+    struct msghdr msg;
+    memset(&msg, 0, sizeof(msg));
 
-  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++)
-  {
-    command_length+= vector->length;
+    increment_udp_message_id(instance);
+    vector[0].buffer= instance->write_buffer;
+    vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
+
+    msg.msg_iov= (struct iovec*)vector;
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+    msg.msg_iovlen= int(count);
+#else
+    msg.msg_iovlen= count;
+#endif
+
+    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);
+      }
+    }
+
+    return MEMCACHED_SUCCESS;
   }
 
-  if (sent_length == -1 or size_t(sent_length) != command_length)
+  bool sent_success= memcached_io_writev(instance, vector, count, with_flush);
+  if (sent_success == false)
   {
-    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 (memcached_is_replying(instance->root))
   {