X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdo.cc;h=2ce64483485a92c08da9c46a5d4cf2be49eb2235;hb=7a02267fc940f3f3431f2c5b7a648fe3577519a9;hp=a51472ba66562a50a18353b1c843bd5c3a3afd7c;hpb=fd8a1d785722f36d111915b0c96331e907df2746;p=m6w6%2Flibmemcached

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index a51472ba..2ce64483 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -12,14 +12,13 @@
 #include <libmemcached/common.h>
 
 memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
-                                 libmemcached_io_vector_st *vector,
+                                 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(instance)))
   {
@@ -35,20 +34,42 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
   **/
   if (memcached_is_udp(instance->root))
   {
-    if (vector->buffer or vector->length)
+    if (vector[0].buffer or vector[0].length)
     {
       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"));
     }
 
-    size_t write_length= io_vector_total_size(vector, 11) +UDP_DATAGRAM_HEADER_LENGTH;
+    struct msghdr msg;
+    memset(&msg, 0, sizeof(msg));
 
-    if (write_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_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;
+    msg.msg_iovlen= count;
+
+    uint32_t retry= 5;
+    while (--retry)
     {
-      return MEMCACHED_WRITE_FAILURE;
+      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_NOT_SUPPORTED;
+    return MEMCACHED_SUCCESS;
   }
 
   ssize_t sent_length= memcached_io_writev(instance, vector, count, with_flush);
@@ -60,9 +81,14 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
 
   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 (memcached_is_replying(instance->root))
   {