Updates to clean server structure.

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 592ede44e804e4dad5b0511f37927b0d1c3d746a..57274be2086a17d35192dd98bd68c54716de2507 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,63 +1,35 @@
-#include <memcached.h>
-
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
-{
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
-
-  if (!hostname)
-    hostname= "localhost"; 
+#include "common.h"
 
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
 
-  ptr->hosts= (memcached_host_st *)realloc(ptr->hosts, sizeof(memcached_host_st) * (ptr->number_of_hosts+1));
-  memset(ptr->hosts, 0, sizeof(memcached_host_st) * (size_t)ptr->number_of_hosts);
-  ptr->hosts[ptr->number_of_hosts].hostname=
-    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
-  memset(ptr->hosts[ptr->number_of_hosts].hostname, 0, strlen(hostname)+1);
-  memcpy(ptr->hosts[ptr->number_of_hosts].hostname, hostname, strlen(hostname));
-  ptr->hosts[ptr->number_of_hosts].port= port;
-  ptr->hosts[ptr->number_of_hosts].fd= -1;
-  ptr->number_of_hosts++;
-
-  return MEMCACHED_SUCCESS;
-}
-
-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;
-  memcached_host_st *host_ptr;
-
-  if (ptr->connected)
-    return MEMCACHED_SUCCESS;
 
-  if (!ptr->hosts)
+  if (ptr->hosts[server_key].fd == -1)
   {
-    memcached_return rc;
-    rc= memcached_server_add(ptr, NULL, 0);
-
-    if (rc != MEMCACHED_SUCCESS)
-      return rc;
-  }
-
+    /* Old connection junk still is in the structure */
+    assert(ptr->hosts[server_key].stack_responses == 0);
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
-  {
-    if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+    if ((h= gethostbyname(ptr->hosts[server_key].hostname)) == NULL)
     {
-      fprintf(stderr, "unknown host '%s'\n", ptr->hosts[x].hostname);
+      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[x].port);
+    servAddr.sin_port = htons(ptr->hosts[server_key].port);
 
     /* Create the socket */
-    if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
     {
-      fprintf(stderr, "cannot open socket");
+      ptr->my_errno= errno;
       return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
     }
 
@@ -67,23 +39,71 @@ memcached_return memcached_connect(memcached_st *ptr)
     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)
+    /* For the moment, not getting a nonblocking mode will note be fatal */
+    if (ptr->flags & MEM_NO_BLOCK)
+    {
+      int flags;
+
+      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)
     {
-      fprintf(stderr, "cannot bind port TCP %u\n", ptr->hosts[x].port);
-      return(MEMCACHED_CONNECTION_BIND_FAILURE);
+      int flag= 1;
+
+      setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
+                 &flag, (socklen_t)sizeof(int));
     }
 
     /* connect to server */
-    if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+test_connect:
+    if (connect(ptr->hosts[server_key].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
     {
-      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", ptr->hosts[x].hostname, 
-              ptr->hosts[x].port,
-              strerror(errno));
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
+      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);
   }
 
-  ptr->connected= 1;
-
   return MEMCACHED_SUCCESS;
 }
+
+
+memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key)
+{
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
+  if (ptr->connected == ptr->number_of_hosts)
+    return MEMCACHED_SUCCESS;
+
+  if (!ptr->hosts)
+    return MEMCACHED_NO_SERVERS;
+
+  /* We need to clean up the multi startup piece */
+  if (server_key)
+    rc= memcached_real_connect(ptr, server_key);
+  else
+  {
+    unsigned int x;
+
+    for (x= 0; x < ptr->number_of_hosts; x++)
+      rc= memcached_real_connect(ptr, x);
+  }
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
+
+  return rc;
+}