Fixed test case output

[m6w6/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 516b5db346482e24500854deef4fbc0c4267aef5..78a7d70337aa560773e50e41c5307f0eb2001689 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,44 +1,9 @@
 #include "common.h"
 
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
-{
-  memcached_server_st *new_host_list;
-  char *new_hostname;
-  LIBMEMCACHED_MEMCACHED_SERVER_ADD_START();
-
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
-
-  if (!hostname)
-    hostname= "localhost"; 
-
-
-  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;
-
-  ptr->hosts= new_host_list;
-
-  new_hostname=
-    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
-  if (!new_hostname)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
-  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++;
-
-  LIBMEMCACHED_MEMCACHED_SERVER_ADD_END();
-
-  return MEMCACHED_SUCCESS;
-}
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
@@ -52,9 +17,7 @@ memcached_return memcached_connect(memcached_st *ptr)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
-  {
     return MEMCACHED_NO_SERVERS;
-  }
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
@@ -68,8 +31,11 @@ memcached_return memcached_connect(memcached_st *ptr)
       servAddr.sin_port = htons(ptr->hosts[x].port);
 
       /* Create the socket */
-      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      if ((ptr->hosts[x].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      {
+        ptr->my_errno= errno;
         return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+      }
 
 
       /* bind any port number */
@@ -77,14 +43,42 @@ 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)
-        return(MEMCACHED_CONNECTION_BIND_FAILURE);
+      /* For the moment, not getting a nonblocking mode will note be fatal */
+      if (ptr->flags & MEM_NO_BLOCK)
+      {
+        int flags;
+      
+        flags= fcntl(ptr->hosts[x].fd, F_GETFL, 0);
+        if (flags != -1)
+          (void)fcntl(ptr->hosts[x].fd, F_SETFL, flags | O_NONBLOCK);
+      }
+
+      if (ptr->flags & MEM_TCP_NODELAY)
+      {
+        int flag= 1;
+
+        setsockopt(ptr->hosts[x].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[x].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++;
+      }
     }
   }
   LIBMEMCACHED_MEMCACHED_CONNECT_END();