#include "common.h"
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
static memcached_return set_hostinfo(memcached_server_st *server)
{
struct addrinfo *ai;
if (ptr->hosts[server_key].fd == -1)
{
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
/*
If we have not allocated the hosts object.
{
if (ptr->hosts[server_key].fd == -1)
{
- /* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
struct addrinfo *use;
+ /* Old connection junk still is in the structure */
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
(!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
{
use->ai_protocol)) < 0)
{
ptr->cached_errno= errno;
+ WATCHPOINT_ERRNO(errno);
return MEMCACHED_CONNECTION_SOCKET_CREATE_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[server_key].fd, F_GETFL, 0);
- if (flags != -1)
- (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+ int error;
+ struct linger linger;
+ struct timeval waittime;
+
+ waittime.tv_sec= 10;
+ waittime.tv_usec= 0;
+
+ linger.l_onoff= 1;
+ linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_LINGER,
+ &linger, (socklen_t)sizeof(struct linger));
+ WATCHPOINT_ASSERT(error == 0);
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDTIMEO,
+ &waittime, (socklen_t)sizeof(struct timeval));
+ WATCHPOINT_ASSERT(error == 0);
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_RCVTIMEO,
+ &waittime, (socklen_t)sizeof(struct timeval));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->flags & MEM_TCP_NODELAY)
{
int flag= 1;
+ int error;
- setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY,
- &flag, (socklen_t)sizeof(int));
+ error= setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY,
+ &flag, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->send_size)
{
- setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->send_size, (socklen_t)sizeof(int));
+ int error;
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->send_size, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->recv_size)
{
- setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->recv_size, (socklen_t)sizeof(int));
+ int error;
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->recv_size, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
}
+ /* For the moment, not getting a nonblocking mode will not 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);
+ }
+ }
+
+
/* connect to server */
test_connect:
if (connect(ptr->hosts[server_key].fd,
}
ptr->connected++;
}
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
}
return MEMCACHED_SUCCESS;