#include "common.h"
+#include <poll.h>
static memcached_return set_hostinfo(memcached_server_st *server)
{
int flags;
flags= fcntl(ptr->fd, F_GETFL, 0);
- if (flags != -1)
+ unlikely (flags != -1)
{
(void)fcntl(ptr->fd, F_SETFL, flags | O_NONBLOCK);
}
sizeof(servAddr)) < 0)
{
switch (errno) {
- /* We are spinning waiting on connect */
- case EALREADY:
case EINPROGRESS:
+ case EALREADY:
case EINTR:
goto test_connect;
case EISCONN: /* We were spinning waiting on connect */
/* We are spinning waiting on connect */
case EALREADY:
case EINPROGRESS:
+ {
+ struct pollfd fds[1];
+ int error;
+
+ memset(&fds, 0, sizeof(struct pollfd));
+ fds[0].fd= ptr->fd;
+ fds[0].events= POLLOUT | POLLERR;
+ error= poll(fds, 1, ptr->root->connect_timeout);
+
+ if (error != 1)
+ {
+ ptr->cached_errno= errno;
+ WATCHPOINT_ERRNO(ptr->cached_errno);
+ close(ptr->fd);
+ ptr->fd= -1;
+ return MEMCACHED_ERRNO;
+ }
+
+ break;
+ }
+ /* We are spinning waiting on connect */
case EINTR:
goto test_connect;
case EISCONN: /* We were spinning waiting on connect */