{
struct pollfd fds[1];
short flags= 0;
- struct timespec timer;
+ int error;
+ int latch= 0;
- timer.tv_sec= 1;
- timer.tv_nsec= 0;
if (read_or_write)
flags= POLLOUT | POLLERR;
else
fds[0].fd= ptr->hosts[server_key].fd;
fds[0].events= flags;
- if (poll(fds, 1, ptr->poll_timeout) < 0)
- return MEMCACHED_FAILURE;
+ while (latch == 0)
+ {
+ error= poll(fds, 1, ptr->poll_timeout);
- return MEMCACHED_SUCCESS;
+ if (error == 1)
+ return MEMCACHED_SUCCESS;
+ else if (error == -1)
+ {
+ memcached_quit_server(ptr, server_key, 1);
+ return MEMCACHED_FAILURE;
+ }
+ else if (error)
+ {
+ /* This is impossible */
+ WATCHPOINT_ASSERT(0);
+ return MEMCACHED_FAILURE;
+ }
+ else
+ latch++;
+ }
+
+ memcached_quit_server(ptr, server_key, 1);
+
+ return MEMCACHED_FAILURE; /* Timeout occurred */
}
ssize_t memcached_io_read(memcached_st *ptr, unsigned int server_key,
break;
default:
{
+ memcached_quit_server(ptr, server_key, 1);
ptr->cached_errno= errno;
return -1;
}
size_t sent_length;
sent_length= memcached_io_flush(ptr, server_key);
+ if (sent_length == -1)
+ return -1;
WATCHPOINT_ASSERT(sent_length == MEMCACHED_MAX_BUFFER);
ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
memcached_return memcached_io_close(memcached_st *ptr, unsigned int server_key)
{
- struct pollfd fds[1];
- short flags= 0;
- struct timespec timer;
memcached_return rc;
- timer.tv_sec= 1;
- timer.tv_nsec= 0;
- flags= POLLHUP | POLLERR;
+ rc= MEMCACHED_SUCCESS;
+ if (ptr->flags & MEM_NO_BLOCK)
+ {
+ int error;
+ struct pollfd fds[1];
+ short flags= 0;
- memset(&fds, 0, sizeof(struct pollfd));
- fds[0].fd= ptr->hosts[server_key].fd;
- fds[0].events= flags;
- fds[0].revents= flags;
+ flags= POLLHUP | POLLERR;
- if (poll(fds, 1, ptr->poll_timeout) < 0)
- rc= MEMCACHED_FAILURE;
- else
- rc= MEMCACHED_SUCCESS;
+ memset(&fds, 0, sizeof(struct pollfd));
+ fds[0].fd= ptr->hosts[server_key].fd;
+ fds[0].events= flags;
+ fds[0].revents= 0;
+
+ error= poll(fds, 1, ptr->poll_timeout == -1 ? 100 : ptr->poll_timeout);
+
+ if (error == -1)
+ {
+ memcached_quit_server(ptr, server_key, 1);
+ return MEMCACHED_FAILURE;
+ }
+ else if (error == 0)
+ return MEMCACHED_FAILURE; /* Timeout occurred */
+ }
close(ptr->hosts[server_key].fd);
}
/* Yes, we want to fall through */
default:
+ memcached_quit_server(ptr, server_key, 1);
ptr->cached_errno= errno;
return -1;
}