projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for non-blocking IO error. The refactoring bit broke some cases where
[m6w6/libmemcached]
/
lib
/
memcached_connect.c
diff --git
a/lib/memcached_connect.c
b/lib/memcached_connect.c
index 278f9da3292710d91a553491b235c9e3606d8ece..9f0c6e7dee863a7fccaaebcce87cd77bb73be2a4 100644
(file)
--- a/
lib/memcached_connect.c
+++ b/
lib/memcached_connect.c
@@
-10,8
+10,9
@@
static memcached_return set_hostinfo(memcached_server_st *server)
sprintf(str_port, "%u", server->port);
memset(&hints, 0, sizeof(hints));
sprintf(str_port, "%u", server->port);
memset(&hints, 0, sizeof(hints));
+ hints.ai_family= AF_INET;
hints.ai_socktype= SOCK_STREAM;
hints.ai_socktype= SOCK_STREAM;
- hints.ai_protocol=
0
;
+ hints.ai_protocol=
IPPROTO_TCP
;
e= getaddrinfo(server->hostname, str_port, &hints, &ai);
if (e != 0)
e= getaddrinfo(server->hostname, str_port, &hints, &ai);
if (e != 0)
@@
-28,14
+29,14
@@
static memcached_return set_hostinfo(memcached_server_st *server)
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-static memcached_return unix_socket_connect(memcached_s
t *ptr, unsigned int server_key
)
+static memcached_return unix_socket_connect(memcached_s
erver_st *ptr
)
{
struct sockaddr_un servAddr;
socklen_t addrlen;
{
struct sockaddr_un servAddr;
socklen_t addrlen;
- if (ptr->
hosts[server_key].
fd == -1)
+ if (ptr->fd == -1)
{
{
- if ((ptr->
hosts[server_key].
fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+ if ((ptr->fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
{
ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
@@
-43,12
+44,12
@@
static memcached_return unix_socket_connect(memcached_st *ptr, unsigned int serv
memset(&servAddr, 0, sizeof (struct sockaddr_un));
servAddr.sun_family= AF_UNIX;
memset(&servAddr, 0, sizeof (struct sockaddr_un));
servAddr.sun_family= AF_UNIX;
- strcpy(servAddr.sun_path, ptr->host
s[server_key].host
name); /* Copy filename */
+ strcpy(servAddr.sun_path, ptr->hostname); /* Copy filename */
addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
test_connect:
addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
test_connect:
- if (connect(ptr->
hosts[server_key].
fd,
+ if (connect(ptr->fd,
(struct sockaddr *)&servAddr,
sizeof(servAddr)) < 0)
{
(struct sockaddr *)&servAddr,
sizeof(servAddr)) < 0)
{
@@
-65,37
+66,36
@@
test_connect:
ptr->cached_errno= errno;
return MEMCACHED_ERRNO;
}
ptr->cached_errno= errno;
return MEMCACHED_ERRNO;
}
- ptr->connected++;
}
}
return MEMCACHED_SUCCESS;
}
}
}
return MEMCACHED_SUCCESS;
}
-static memcached_return udp_connect(memcached_s
t *ptr, unsigned int server_key
)
+static memcached_return udp_connect(memcached_s
erver_st *ptr
)
{
{
- if (ptr->
hosts[server_key].
fd == -1)
+ if (ptr->fd == -1)
{
/* Old connection junk still is in the structure */
{
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->
hosts[server_key].
cursor_active == 0);
+ WATCHPOINT_ASSERT(ptr->cursor_active == 0);
/*
If we have not allocated the hosts object.
Or if the cache has not been set.
*/
/*
If we have not allocated the hosts object.
Or if the cache has not been set.
*/
- if (ptr->
hosts[server_key].
sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
- (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
+ if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
+ (!(ptr->
root->
flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
{
memcached_return rc;
- rc= set_hostinfo(
&ptr->hosts[server_key]
);
+ rc= set_hostinfo(
ptr
);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
- ptr->
hosts[server_key].
sockaddr_inited= MEMCACHED_ALLOCATED;
+ ptr->sockaddr_inited= MEMCACHED_ALLOCATED;
}
/* Create the socket */
}
/* Create the socket */
- if ((ptr->
hosts[server_key].
fd= socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ if ((ptr->fd= socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{
ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
{
ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
@@
-105,38
+105,38
@@
static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-static memcached_return tcp_connect(memcached_s
t *ptr, unsigned int server_key
)
+static memcached_return tcp_connect(memcached_s
erver_st *ptr
)
{
{
- if (ptr->
hosts[server_key].
fd == -1)
+ if (ptr->fd == -1)
{
struct addrinfo *use;
/* Old connection junk still is in the structure */
{
struct addrinfo *use;
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->
hosts[server_key].
cursor_active == 0);
+ WATCHPOINT_ASSERT(ptr->cursor_active == 0);
- if (ptr->
hosts[server_key].
sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
- (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
+ if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
+ (!(ptr->
root->
flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
{
memcached_return rc;
- rc= set_hostinfo(
&ptr->hosts[server_key]
);
+ rc= set_hostinfo(
ptr
);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
- ptr->
hosts[server_key].
sockaddr_inited= MEMCACHED_ALLOCATED;
+ ptr->sockaddr_inited= MEMCACHED_ALLOCATED;
}
}
- use= ptr->
hosts[server_key].
address_info;
+ use= ptr->address_info;
/* Create the socket */
/* Create the socket */
- if ((ptr->
hosts[server_key].
fd= socket(use->ai_family,
-
use->ai_socktype,
-
use->ai_protocol)) < 0)
+ if ((ptr->fd= socket(use->ai_family,
+ use->ai_socktype,
+ use->ai_protocol)) < 0)
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(errno);
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
}
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(errno);
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
}
- if (ptr->flags & MEM_NO_BLOCK)
+ if (ptr->
root->
flags & MEM_NO_BLOCK)
{
int error;
struct linger linger;
{
int error;
struct linger linger;
@@
-147,63
+147,63
@@
static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
linger.l_onoff= 1;
linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
linger.l_onoff= 1;
linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
- error= setsockopt(ptr->
hosts[server_key].
fd, SOL_SOCKET, SO_LINGER,
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_LINGER,
&linger, (socklen_t)sizeof(struct linger));
WATCHPOINT_ASSERT(error == 0);
&linger, (socklen_t)sizeof(struct linger));
WATCHPOINT_ASSERT(error == 0);
- error= setsockopt(ptr->
hosts[server_key].
fd, SOL_SOCKET, SO_SNDTIMEO,
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDTIMEO,
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
- error= setsockopt(ptr->
hosts[server_key].
fd, SOL_SOCKET, SO_RCVTIMEO,
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVTIMEO,
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
- if (ptr->flags & MEM_TCP_NODELAY)
+ if (ptr->
root->
flags & MEM_TCP_NODELAY)
{
int flag= 1;
int error;
{
int flag= 1;
int error;
- error= setsockopt(ptr->
hosts[server_key].
fd, IPPROTO_TCP, TCP_NODELAY,
+ error= setsockopt(ptr->fd, IPPROTO_TCP, TCP_NODELAY,
&flag, (socklen_t)sizeof(int));
WATCHPOINT_ASSERT(error == 0);
}
&flag, (socklen_t)sizeof(int));
WATCHPOINT_ASSERT(error == 0);
}
- if (ptr->send_size)
+ if (ptr->
root->
send_size)
{
int error;
{
int error;
- error= setsockopt(ptr->
hosts[server_key].
fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->send_size, (socklen_t)sizeof(int));
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->
root->
send_size, (socklen_t)sizeof(int));
WATCHPOINT_ASSERT(error == 0);
}
WATCHPOINT_ASSERT(error == 0);
}
- if (ptr->recv_size)
+ if (ptr->r
oot->r
ecv_size)
{
int error;
{
int error;
- error= setsockopt(ptr->
hosts[server_key].
fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->recv_size, (socklen_t)sizeof(int));
+ error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->r
oot->r
ecv_size, (socklen_t)sizeof(int));
WATCHPOINT_ASSERT(error == 0);
}
/* For the moment, not getting a nonblocking mode will not be fatal */
WATCHPOINT_ASSERT(error == 0);
}
/* For the moment, not getting a nonblocking mode will not be fatal */
- if (ptr->flags & MEM_NO_BLOCK)
+ if (ptr->
root->
flags & MEM_NO_BLOCK)
{
int flags;
{
int flags;
- flags= fcntl(ptr->
hosts[server_key].
fd, F_GETFL, 0);
+ flags= fcntl(ptr->fd, F_GETFL, 0);
if (flags != -1)
{
if (flags != -1)
{
- (void)fcntl(ptr->
hosts[server_key].
fd, F_SETFL, flags | O_NONBLOCK);
+ (void)fcntl(ptr->fd, F_SETFL, flags | O_NONBLOCK);
}
}
/* connect to server */
test_connect:
}
}
/* connect to server */
test_connect:
- if (connect(ptr->
hosts[server_key].
fd,
+ if (connect(ptr->fd,
use->ai_addr,
use->ai_addrlen) < 0)
{
use->ai_addr,
use->ai_addrlen) < 0)
{
@@
-217,48
+217,44
@@
test_connect:
break;
default:
ptr->cached_errno= errno;
break;
default:
ptr->cached_errno= errno;
+ WATCHPOINT_ASSERT(errno == ECONNREFUSED);
WATCHPOINT_ERRNO(ptr->cached_errno);
WATCHPOINT_ERRNO(ptr->cached_errno);
- close(ptr->
hosts[server_key].
fd);
- ptr->
hosts[server_key].
fd= -1;
+ close(ptr->fd);
+ ptr->fd= -1;
return MEMCACHED_ERRNO;
}
return MEMCACHED_ERRNO;
}
- ptr->connected++;
}
}
- WATCHPOINT_ASSERT(ptr->
hosts[server_key].
cursor_active == 0);
+ WATCHPOINT_ASSERT(ptr->cursor_active == 0);
}
return MEMCACHED_SUCCESS;
}
}
return MEMCACHED_SUCCESS;
}
-memcached_return memcached_connect(memcached_s
t *ptr, unsigned int server_key
)
+memcached_return memcached_connect(memcached_s
erver_st *ptr
)
{
memcached_return rc= MEMCACHED_NO_SERVERS;
LIBMEMCACHED_MEMCACHED_CONNECT_START();
{
memcached_return rc= MEMCACHED_NO_SERVERS;
LIBMEMCACHED_MEMCACHED_CONNECT_START();
- if (ptr->connected == ptr->number_of_hosts && ptr->number_of_hosts)
- return MEMCACHED_SUCCESS;
-
- if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
- return MEMCACHED_NO_SERVERS;
-
/* We need to clean up the multi startup piece */
/* We need to clean up the multi startup piece */
- switch (ptr->
hosts[server_key].
type)
+ switch (ptr->type)
{
case MEMCACHED_CONNECTION_UNKNOWN:
WATCHPOINT_ASSERT(0);
rc= MEMCACHED_NOT_SUPPORTED;
break;
case MEMCACHED_CONNECTION_UDP:
{
case MEMCACHED_CONNECTION_UNKNOWN:
WATCHPOINT_ASSERT(0);
rc= MEMCACHED_NOT_SUPPORTED;
break;
case MEMCACHED_CONNECTION_UDP:
- rc= udp_connect(ptr
, server_key
);
+ rc= udp_connect(ptr);
break;
case MEMCACHED_CONNECTION_TCP:
break;
case MEMCACHED_CONNECTION_TCP:
- rc= tcp_connect(ptr
, server_key
);
+ rc= tcp_connect(ptr);
break;
case MEMCACHED_CONNECTION_UNIX_SOCKET:
break;
case MEMCACHED_CONNECTION_UNIX_SOCKET:
- rc= unix_socket_connect(ptr
, server_key
);
+ rc= unix_socket_connect(ptr);
break;
break;
+ default:
+ WATCHPOINT_ASSERT(0);
}
if (rc != MEMCACHED_SUCCESS)
}
if (rc != MEMCACHED_SUCCESS)