Updates to clean server structure.

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 899101a2f4199ddf7342aa08e8b692eebfb9a28d..57274be2086a17d35192dd98bd68c54716de2507 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,87 +1,109 @@
-#include <memcached.h>
+#include "common.h"
 
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+
+memcached_return memcached_real_connect(memcached_st *ptr, unsigned int server_key)
 {
-  memcached_server_st *new_host_list;
-  char *new_hostname;
+  struct sockaddr_in localAddr, servAddr;
+  struct hostent *h;
+
+  if (ptr->hosts[server_key].fd == -1)
+  {
+    /* Old connection junk still is in the structure */
+    assert(ptr->hosts[server_key].stack_responses == 0);
+
+    if ((h= gethostbyname(ptr->hosts[server_key].hostname)) == NULL)
+    {
+      ptr->my_errno= h_errno;
+      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[server_key].port);
 
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
+    /* 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;
+    }
 
-  if (!hostname)
-    hostname= "localhost"; 
 
+    /* bind any port number */
+    localAddr.sin_family = AF_INET;
+    localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+    localAddr.sin_port = htons(0);
 
-  new_host_list= (memcached_server_st *)realloc(ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
-  if (!new_host_list)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  memset(&new_host_list[ptr->number_of_hosts], 0, sizeof(memcached_server_st));
-  
-  if (!new_host_list)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    /* For the moment, not getting a nonblocking mode will note be fatal */
+    if (ptr->flags & MEM_NO_BLOCK)
+    {
+      int flags;
 
-  ptr->hosts= new_host_list;
+      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);
+    }
 
-  new_hostname=
-    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
-  if (!new_hostname)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    if (ptr->flags & MEM_TCP_NODELAY)
+    {
+      int flag= 1;
 
-  memset(new_hostname, 0, strlen(hostname)+1);
-  memcpy(new_hostname, hostname, strlen(hostname));
-  ptr->hosts[ptr->number_of_hosts].hostname= new_hostname;
-  ptr->hosts[ptr->number_of_hosts].port= port;
-  ptr->hosts[ptr->number_of_hosts].fd= -1;
-  ptr->number_of_hosts++;
+      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 EALREADY:
+      case EINPROGRESS:
+      case EINTR:
+        goto test_connect;
+      case EISCONN: /* We were spinning waiting on connect */
+        break;
+      default:
+        ptr->my_errno= errno;
+        return MEMCACHED_ERRNO;
+      }
+      ptr->connected++;
+    }
+    assert(ptr->hosts[server_key].stack_responses == 0);
+  }
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return memcached_connect(memcached_st *ptr)
+
+memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key)
 {
-  unsigned int x;
-  struct sockaddr_in localAddr, servAddr;
-  struct hostent *h;
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
 
   if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
-  {
     return MEMCACHED_NO_SERVERS;
-  }
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  /* We need to clean up the multi startup piece */
+  if (server_key)
+    rc= memcached_real_connect(ptr, server_key);
+  else
   {
-    if (ptr->hosts[x].fd == -1)
-    {
-      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);
+    unsigned int x;
 
-      /* Create the socket */
-      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-        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->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
-        return(MEMCACHED_CONNECTION_BIND_FAILURE);
-
-      /* connect to server */
-      if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-        return MEMCACHED_HOST_LOCKUP_FAILURE;
-
-      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;
 }