X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdo.cc;h=daf1a1150eb2d242303b9826488f9475a6a67283;hb=24d604ebd655a7e3afe584d3dc4a25f5eca372c3;hp=ee777d3e40a9da7af38f335c22b209a4a3881a8d;hpb=6edcc9e0e093c5d082ac76b1dcc73396897f5c24;p=awesomized%2Flibmemcached

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index ee777d3e..daf1a115 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,20 +11,72 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
-                                 const struct libmemcached_io_vector_st *vector,
+static memcached_return_t _vdo_udp(memcached_instance_st* instance,
+                                   libmemcached_io_vector_st vector[],
+                                   const size_t count)
+{
+#ifndef __MINGW32__
+  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"));
+  }
+
+  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;
+#ifdef __APPLE__
+  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;
+#else
+  (void)instance;
+  (void)vector;
+  (void)count;
+  return MEMCACHED_FAILURE;
+#endif
+}
+
+memcached_return_t memcached_vdo(memcached_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 Instance showed none.");
     return rc;
   }
 
@@ -33,32 +85,28 @@ 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_io_write(ptr, NULL, 0, true) == -1)
-    {
-      memcached_io_reset(ptr);
-      return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
-    }
-  }
-
-  ssize_t sent_length= memcached_io_writev(ptr, vector, count, with_flush);
-
-  size_t command_length= 0;
-  for (uint32_t x= 0; x < count; ++x, vector++)
+  if (memcached_is_udp(instance->root))
   {
-    command_length+= vector->length;
+    return _vdo_udp(instance, vector, count);
   }
 
-  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);
+    //assert(memcached_last_error(instance->root) == MEMCACHED_SUCCESS);
+    if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
+    {
+      //assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
+      return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    }
+    else
+    {
+      rc= memcached_last_error(instance->root);
+    }
   }
-  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;