X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_io.c;h=8f72f54d0104fe255c1503a068713e9b01d17ff4;hb=e2a313f77fd825bdaec9db1649b0549b2d5962c2;hp=401039b4efbd831ee2c0eddc1ab0e3f8692aac23;hpb=85a66fec1e07e874e5410ce56a2976d68fbe14fd;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 401039b4..8f72f54d 100644
--- a/lib/memcached_io.c
+++ b/lib/memcached_io.c
@@ -2,87 +2,111 @@
   Basic socket buffered IO
 */
 
-#include <memcached.h>
+#include "common.h"
 #include "memcached_io.h"
 #include <sys/select.h>
+#include <poll.h>
+
+static int io_wait(memcached_st *ptr, unsigned int server_key, unsigned read_or_write)
+{
+  struct pollfd fds[1];
+  short flags= 0;
+  int error;
+  int latch= 0;
+
+  if (read_or_write)
+    flags= POLLOUT |  POLLERR;
+  else
+    flags= POLLIN | POLLERR;
+
+  memset(&fds, 0, sizeof(struct pollfd));
+  fds[0].fd= ptr->hosts[server_key].fd;
+  fds[0].events= flags;
+
+  while (latch == 0)
+  {
+    error= poll(fds, 1, ptr->poll_timeout);
+
+    if (error == 1)
+      return MEMCACHED_SUCCESS;
+    else if (error == -1)
+    {
+      memcached_quit_server(ptr, server_key, 1);
+      return MEMCACHED_FAILURE;
+    }
+    else if (error)
+    {
+      /* This is impossible */
+      WATCHPOINT_ASSERT(0);
+      return MEMCACHED_FAILURE;
+    }
+    else
+      latch++;
+  }
+
+  memcached_quit_server(ptr, server_key, 1);
+
+  return MEMCACHED_FAILURE; /* Timeout occurred */
+}
 
 ssize_t memcached_io_read(memcached_st *ptr, unsigned  int server_key,
                           char *buffer, size_t length)
 {
-  size_t x;
   char *buffer_ptr;
 
   buffer_ptr= buffer;
 
-  for (x= 0, buffer_ptr= buffer; 
-       x < length; x++)
+  while (length)
   {
-    if (!ptr->read_buffer_length)
+    if (!ptr->hosts[server_key].read_buffer_length)
     {
-      if (length > 1)
-      {
+      size_t data_read;
 
-        size_t data_read;
-        data_read= recv(ptr->hosts[server_key].fd, 
-                        buffer_ptr, 
-                        length - x, 0);
-        if (data_read == -1)
-        {
-          return -1;
-        }
-        if (data_read == 0)
-          return x;
-
-        data_read+= x;
-
-        return data_read;
-      }
-      else
+      while (1)
       {
-        size_t data_read;
-try_again:
-
         if (ptr->flags & MEM_NO_BLOCK)
         {
-          struct timeval local_tv;
-          fd_set set;
-
-          memset(&local_tv, 0, sizeof(struct timeval));
+          memcached_return rc;
 
-          local_tv.tv_sec= 0;
-          local_tv.tv_usec= 300;
-
-          FD_ZERO(&set);
-          FD_SET(ptr->hosts[server_key].fd, &set);
-
-          select(1, &set, NULL, NULL, &local_tv);
+          rc= io_wait(ptr, server_key, 0);
+          if (rc != MEMCACHED_SUCCESS)
+            return -1;
         }
 
-        data_read= recv(ptr->hosts[server_key].fd, 
-                        ptr->read_buffer, 
-                        MEMCACHED_MAX_BUFFER, 0);
+        data_read= read(ptr->hosts[server_key].fd, 
+                        ptr->hosts[server_key].read_buffer, 
+                        MEMCACHED_MAX_BUFFER);
         if (data_read == -1)
         {
-          if (errno == EAGAIN)
-            goto try_again;
-          return -1;
+          switch (errno)
+          {
+          case EAGAIN:
+            break;
+          default:
+            {
+              memcached_quit_server(ptr, server_key, 1);
+              ptr->cached_errno= errno;
+              return -1;
+            }
+          }
         }
-        ptr->read_buffer_length= data_read;
-        ptr->read_ptr= ptr->read_buffer;
+        else if (data_read)
+          break;
+        /* If zero, just keep looping */
       }
 
-      if (ptr->read_buffer_length == -1)
-        return -1;
-      if (ptr->read_buffer_length == 0)
-        return x;
+      ptr->hosts[server_key].read_buffer_length= data_read;
+      ptr->hosts[server_key].read_ptr= ptr->hosts[server_key].read_buffer;
     }
-    *buffer_ptr= *ptr->read_ptr;
+
+    *buffer_ptr= *ptr->hosts[server_key].read_ptr;
+    length--;
+    ptr->hosts[server_key].read_ptr++;
+    ptr->hosts[server_key].read_buffer_length--;
     buffer_ptr++;
-    ptr->read_ptr++;
-    ptr->read_buffer_length--;
   }
 
-  return length;
+  return (size_t)(buffer_ptr - buffer);
 }
 
 ssize_t memcached_io_write(memcached_st *ptr, unsigned int server_key,
@@ -92,57 +116,137 @@ ssize_t memcached_io_write(memcached_st *ptr, unsigned int server_key,
 
   for (x= 0; x < length; x++)
   {
-    ptr->write_buffer[ptr->write_buffer_offset]= buffer[x];
-    ptr->write_buffer_offset++;
-
-    if (ptr->write_buffer_offset == MEMCACHED_MAX_BUFFER)
+    if (ptr->hosts[server_key].write_ptr == 0)
+      ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].write_ptr);
+    *ptr->hosts[server_key].write_ptr= buffer[x];
+    ptr->hosts[server_key].write_ptr++;
+    ptr->hosts[server_key].write_buffer_offset++;
+
+    if (ptr->hosts[server_key].write_buffer_offset == MEMCACHED_MAX_BUFFER)
     {
       size_t sent_length;
 
       sent_length= memcached_io_flush(ptr, server_key);
+      if (sent_length == -1)
+        return -1;
 
-      assert(sent_length == MEMCACHED_MAX_BUFFER);
-      ptr->write_buffer_offset= 0;
+      WATCHPOINT_ASSERT(sent_length == MEMCACHED_MAX_BUFFER);
+      ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+      ptr->hosts[server_key].write_buffer_offset= 0;
     }
   }
 
   if (with_flush)
-    memcached_io_flush(ptr, server_key);
+  {
+    if (memcached_io_flush(ptr, server_key) == -1)
+      return -1;
+  }
 
   return length;
 }
 
+memcached_return memcached_io_close(memcached_st *ptr, unsigned int server_key)
+{
+  memcached_return rc;
+
+  rc= MEMCACHED_SUCCESS;
+  if (ptr->flags & MEM_NO_BLOCK)
+  {
+    int error;
+    struct pollfd fds[1];
+    short flags= 0;
+
+    flags= POLLHUP |  POLLERR;
+
+    memset(&fds, 0, sizeof(struct pollfd));
+    fds[0].fd= ptr->hosts[server_key].fd;
+    fds[0].events= flags;
+    fds[0].revents= 0;
+
+    error= poll(fds, 1, ptr->poll_timeout == -1 ? 100 : ptr->poll_timeout);
+
+    if (error == -1)
+    {
+      memcached_quit_server(ptr, server_key, 1);
+      return MEMCACHED_FAILURE;
+    }
+    else if (error == 0)
+      return MEMCACHED_FAILURE; /* Timeout occurred */
+  }
+
+  close(ptr->hosts[server_key].fd);
+
+  return rc;
+}
+
 ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
 {
   size_t sent_length;
+  size_t return_length;
+  char *write_ptr= ptr->hosts[server_key].write_buffer;
+  size_t write_length= ptr->hosts[server_key].write_buffer_offset;
+  unsigned int loop= 1;
 
-  if (ptr->write_buffer_offset == 0)
+  if (ptr->hosts[server_key].write_buffer_offset == 0)
     return 0;
 
-  if (ptr->flags & MEM_NO_BLOCK)
+  return_length= 0;
+  while (write_length)
   {
-    struct timeval local_tv;
-    fd_set set;
+    if (ptr->flags & MEM_NO_BLOCK)
+    {
+      memcached_return rc;
 
-    local_tv.tv_sec= 0;
-    local_tv.tv_usec= 300;
+      rc= io_wait(ptr, server_key, 1);
+      if (rc != MEMCACHED_SUCCESS)
+        return -1;
+    }
 
-    FD_ZERO(&set);
-    FD_SET(ptr->hosts[server_key].fd, &set);
+    sent_length= 0;
+    if (ptr->hosts[server_key].type == MEMCACHED_CONNECTION_UDP)
+    {
+      sent_length= sendto(ptr->hosts[server_key].fd, 
+                          write_ptr, write_length, 0, 
+                          (struct sockaddr *)&ptr->hosts[server_key].address_info->ai_addr, 
+                          sizeof(struct sockaddr));
+    }
+    else
+    {
+      if ((ssize_t)(sent_length= write(ptr->hosts[server_key].fd, write_ptr, 
+                                       write_length)) == -1)
+      {
+        switch (errno)
+        {
+        case ENOBUFS:
+        case EAGAIN:
+          WATCHPOINT;
+          continue;
+          if (loop < 100)
+          {
+            loop++;
+            break;
+          }
+          /* Yes, we want to fall through */
+        default:
+          memcached_quit_server(ptr, server_key, 1);
+          ptr->cached_errno= errno;
+          return -1;
+        }
+      }
+    }
 
-    select(1, NULL, &set, NULL, &local_tv);
-  }
-  if ((sent_length= send(ptr->hosts[server_key].fd, ptr->write_buffer, 
-                         ptr->write_buffer_offset, 0)) == -1)
-  {
-    return -1;
+    write_ptr+= sent_length;
+    write_length-= sent_length;
+    return_length+= sent_length;
   }
 
-  assert(sent_length == ptr->write_buffer_offset);
-
-  ptr->write_buffer_offset= 0;
+  WATCHPOINT_ASSERT(write_length == 0);
+  WATCHPOINT_ASSERT(return_length == ptr->hosts[server_key].write_buffer_offset);
+  ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+  ptr->hosts[server_key].write_buffer_offset= 0;
 
-  return sent_length;
+  return return_length;
 }
 
 /* 
@@ -150,6 +254,7 @@ ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
 */
 void memcached_io_reset(memcached_st *ptr, unsigned int server_key)
 {
-  ptr->write_buffer_offset= 0;
+  ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+  ptr->hosts[server_key].write_buffer_offset= 0;
   memcached_quit(ptr);
 }