X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=f95b8e7d752f3115298cf85310b63c1d93a9bb69;hb=04ba254a9c8b8be2aec1794bece362bc819acffc;hp=2120db5c7b4e3d3a5f5aa8bde378490bbf6c765f;hpb=3529e69b4a637b6875d82cb22a250d8abc6e8e85;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 2120db5c..f95b8e7d 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,59 +1,100 @@
 #include "common.h"
 
 #include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
 
-memcached_return memcached_connect(memcached_st *ptr)
+memcached_return memcached_real_connect(memcached_st *ptr, unsigned int server_key)
 {
-  unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
 
-  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+  if (ptr->hosts[server_key].fd == -1)
+  {
+    if ((h= gethostbyname(ptr->hosts[server_key].hostname)) == NULL)
+      return MEMCACHED_HOST_LOCKUP_FAILURE;
 
-  if (ptr->connected == ptr->number_of_hosts)
-    return MEMCACHED_SUCCESS;
+    servAddr.sin_family= h->h_addrtype;
+    memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+    servAddr.sin_port = htons(ptr->hosts[server_key].port);
 
-  if (!ptr->hosts)
-    return MEMCACHED_NO_SERVERS;
+    /* Create the socket */
+    if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+      ptr->my_errno= errno;
+      return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+    }
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
-  {
-    if (ptr->hosts[x].fd == -1)
+
+    /* bind any port number */
+    localAddr.sin_family = AF_INET;
+    localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+    localAddr.sin_port = htons(0);
+
+    /* For the moment, not getting a nonblocking mode will note be fatal */
+    if (ptr->flags & MEM_NO_BLOCK)
     {
       int flags;
-      
-      if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+
+      flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
+      if (flags != -1)
+        (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+    }
+
+    if (ptr->flags & MEM_TCP_NODELAY)
+    {
+      int flag= 1;
+
+      setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
+                 &flag, (socklen_t)sizeof(int));
+    }
+
+    /* connect to server */
+test_connect:
+    if (connect(ptr->hosts[server_key].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+    {
+      switch (errno) {
+        /* We are spinning waiting on connect */
+      case EINPROGRESS:
+      case EINTR:
+        goto test_connect;
+      case EISCONN: /* We were spinning waiting on connect */
+        break;
+      default:
+        ptr->my_errno= errno;
         return MEMCACHED_HOST_LOCKUP_FAILURE;
+      }
+      ptr->connected++;
+    }
+  }
 
-      servAddr.sin_family= h->h_addrtype;
-      memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
-      servAddr.sin_port = htons(ptr->hosts[x].port);
+  return MEMCACHED_SUCCESS;
+}
 
-      /* Create the socket */
-      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-        return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
 
+memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key)
+{
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
 
-      /* bind any port number */
-      localAddr.sin_family = AF_INET;
-      localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-      localAddr.sin_port = htons(0);
+  if (ptr->connected == ptr->number_of_hosts)
+    return MEMCACHED_SUCCESS;
 
-#ifdef NOT_YET
-      /* For the moment, not getting a nonblocking mode will note be fatal */
-      flags= fcntl(ptr->hosts[0].fd, F_GETFL, 0);
-      if (flags != -1)
-        (void)fcntl(ptr->hosts[0].fd, F_SETFL, flags | O_NONBLOCK);
-#endif
+  if (!ptr->hosts)
+    return MEMCACHED_NO_SERVERS;
 
-      /* connect to server */
-      if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-        return MEMCACHED_HOST_LOCKUP_FAILURE;
+  /* We need to clean up the multi startup piece */
+  if (server_key)
+    rc= memcached_real_connect(ptr, server_key);
+  else
+  {
+    unsigned int x;
 
-      ptr->connected++;
-    }
+    for (x= 0; x < ptr->number_of_hosts; x++)
+      rc= memcached_real_connect(ptr, x);
   }
   LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
-  return MEMCACHED_SUCCESS;
+  return rc;
 }