X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=5b024749b1f58038f24c515361c5d7f49a0e1365;hb=8c34786ea9d4b879bf5c5cf7ad811836f0d1f37f;hp=5b3644a18b198053620f1974b5b773389689cf9b;hpb=7cbcd28d0e2958df0572d965996a65e22b18e66a;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 5b3644a1..5b024749 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,107 +1,76 @@
-#include <memcached.h>
+#include "common.h"
 
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
-{
-  memcached_host_st *host_ptr, *prev_ptr;
-
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
-
-  if (!hostname)
-    hostname= "localhost"; 
-
-  if (ptr->hosts)
-  {
-    for (host_ptr= ptr->hosts; host_ptr; host_ptr= host_ptr->next)
-      prev_ptr= host_ptr;
-    host_ptr= (memcached_host_st *)malloc(sizeof(memcached_host_st));
-    if (!host_ptr)
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-    prev_ptr->next= host_ptr;
-  }
-  else
-  {
-    ptr->hosts=
-      host_ptr= (memcached_host_st *)malloc(sizeof(memcached_host_st));
-    if (!host_ptr)
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-
-  memset(host_ptr, 0, sizeof(memcached_host_st));
-  host_ptr->hostname= (char *)malloc(sizeof(char) * strlen(hostname));
-
-  if (!host_ptr->hostname)
-  {
-    free(host_ptr);
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-  memcpy(host_ptr->hostname, hostname, strlen(hostname));
-  host_ptr->port= port;
-
-  return MEMCACHED_SUCCESS;
-}
+#include <fcntl.h>
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
+  unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
-  memcached_host_st *host_ptr;
 
-  if (ptr->connected)
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
+  if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
-  {
-    memcached_return rc;
-    rc= memcached_server_add(ptr, NULL, 0);
+    return MEMCACHED_NO_SERVERS;
 
-    if (rc != MEMCACHED_SUCCESS)
-      return rc;
-  }
-
-
-  for (host_ptr= ptr->hosts; host_ptr; host_ptr= host_ptr->next)
+  for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if ((h= gethostbyname(host_ptr->hostname)) == NULL)
-    {
-      fprintf(stderr, "unknown host '%s'\n", host_ptr->hostname);
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
-    }
-
-    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(host_ptr->port);
-
-    /* Create the socket */
-    if ((ptr->fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-      fprintf(stderr, "cannot open socket");
-      return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
-    }
-
-
-    /* bind any port number */
-    localAddr.sin_family = AF_INET;
-    localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    localAddr.sin_port = htons(0);
-
-    if (bind(ptr->fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
+    if (ptr->hosts[x].fd == -1)
     {
-      fprintf(stderr, "cannot bind port TCP %u\n", host_ptr->port);
-      return(MEMCACHED_CONNECTION_BIND_FAILURE);
-    }
-
-    /* connect to server */
-    if (connect(ptr->fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-    {
-      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", host_ptr->hostname, 
-              host_ptr->port,
-              strerror(errno));
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
+      int flags;
+      
+      if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+        return MEMCACHED_HOST_LOCKUP_FAILURE;
+
+      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);
+
+      /* Create the socket */
+      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      {
+        ptr->my_errno= errno;
+        return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+      }
+
+
+      /* 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)
+      {
+        flags= fcntl(ptr->hosts[0].fd, F_GETFL, 0);
+        if (flags != -1)
+          (void)fcntl(ptr->hosts[0].fd, F_SETFL, flags | O_NONBLOCK);
+      }
+
+      /* connect to server */
+test_connect:
+      if (connect(ptr->hosts[0].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++;
+      }
     }
   }
-
-  ptr->connected= 1;
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return MEMCACHED_SUCCESS;
 }