X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdo.cc;h=2ce64483485a92c08da9c46a5d4cf2be49eb2235;hb=5e18f5bdda1bebc6e6eef25a37d0a04a30e847af;hp=551b28ea57ce21393fcbaefbb47dc800b7f20724;hpb=c69776b7cf0d0c26b07abd83da8a797182ff6fae;p=m6w6%2Flibmemcached

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 551b28ea..2ce64483 100644
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,17 +11,19 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const void *command,
-                                size_t command_length, bool with_flush)
+memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+                                 libmemcached_io_vector_st vector[],
+                                 const size_t count,
+                                 const bool with_flush)
 {
-  assert_msg(command_length, "Programming error, somehow a command had a length of zero");
-  assert_msg(command, "Programming error, somehow a command was NULL");
-
   memcached_return_t rc;
-  if (memcached_failed(rc= memcached_connect(ptr)))
+
+  assert_msg(vector, "Invalid vector passed");
+
+  if (memcached_failed(rc= memcached_connect(instance)))
   {
-    WATCHPOINT_ASSERT(rc == memcached_last_error(ptr->root));
     WATCHPOINT_ERROR(rc);
+    assert_msg(instance->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
     return rc;
   }
 
@@ -30,53 +32,47 @@ memcached_return_t memcached_do(memcached_server_write_instance_st ptr, const vo
   ** before they start writing, if there is any data in buffer, clear it out,
   ** otherwise we might get a partial write.
   **/
-  if (ptr->type == MEMCACHED_CONNECTION_UDP && with_flush && ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+  if (memcached_is_udp(instance->root))
   {
-    memcached_io_write(ptr, NULL, 0, true);
-  }
+    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"));
+    }
 
-  ssize_t sent_length= memcached_io_write(ptr, command, command_length, with_flush);
+    struct msghdr msg;
+    memset(&msg, 0, sizeof(msg));
 
-  if (sent_length == -1 or size_t(sent_length) != command_length)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-  }
-  else if ((ptr->root->flags.no_reply) == 0)
-  {
-    memcached_server_response_increment(ptr);
-  }
-
-  return rc;
-}
+    increment_udp_message_id(instance);
+    vector[0].buffer= instance->write_buffer;
+    vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
 
-memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
-                                 const struct libmemcached_io_vector_st *vector, size_t count,
-                                 bool with_flush)
-{
-  memcached_return_t rc;
+    msg.msg_iov= (struct iovec*)vector;
+    msg.msg_iovlen= count;
 
-  WATCHPOINT_ASSERT(count);
-  WATCHPOINT_ASSERT(vector);
+    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);
+        }
 
-  if (memcached_failed(rc= memcached_connect(ptr)))
-  {
-    WATCHPOINT_ERROR(rc);
-    assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
-    return rc;
-  }
+        return memcached_set_errno(*instance, errno, MEMCACHED_AT);
+      }
+    }
 
-  /*
-  ** Since non buffering ops in UDP mode dont check to make sure they will fit
-  ** before they start writing, if there is any data in buffer, clear it out,
-  ** otherwise we might get a partial write.
-  **/
-  if (ptr->type == MEMCACHED_CONNECTION_UDP && with_flush && ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
-  {
-    memcached_io_write(ptr, NULL, 0, true);
+    return MEMCACHED_SUCCESS;
   }
 
-  ssize_t sent_length= memcached_io_writev(ptr, vector, count, with_flush);
-
+  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++)
   {
@@ -85,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;