int error;
if (read_or_write == MEM_WRITE) /* write */
- flags= POLLOUT | POLLERR;
+ flags= POLLOUT;
else
- flags= POLLIN | POLLERR;
+ flags= POLLIN;
memset(&fds, 0, sizeof(struct pollfd));
fds[0].fd= ptr->fd;
}
#endif
-ssize_t memcached_io_read(memcached_server_st *ptr,
- void *buffer, size_t length)
+memcached_return memcached_io_read(memcached_server_st *ptr,
+ void *buffer, size_t length, ssize_t *nread)
{
char *buffer_ptr;
while (1)
{
- data_read= read(ptr->fd,
- ptr->read_buffer,
- MEMCACHED_MAX_BUFFER);
+ data_read= read(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER);
if (data_read > 0)
break;
else if (data_read == -1)
{
ptr->cached_errno= errno;
+ memcached_return rc= MEMCACHED_UNKNOWN_READ_FAILURE;
switch (errno)
{
case EAGAIN:
- case EINTR:
- {
- memcached_return rc;
-
- rc= io_wait(ptr, MEM_READ);
+ case EINTR:
+ if ((rc= io_wait(ptr, MEM_READ)) == MEMCACHED_SUCCESS)
+ continue;
+ /* fall through */
- if (rc == MEMCACHED_SUCCESS)
- continue;
- }
- /* fall trough */
default:
{
memcached_quit_server(ptr, 1);
- return -1;
+ *nread= -1;
+ return rc;
}
}
}
it will return EGAIN if data is not immediatly available.
*/
memcached_quit_server(ptr, 1);
- return -1;
+ *nread= -1;
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
}
}
}
}
- return (size_t)(buffer_ptr - (char*)buffer);
+ ptr->server_failure_counter= 0;
+ *nread = (size_t)(buffer_ptr - (char*)buffer);
+ return MEMCACHED_SUCCESS;
}
ssize_t memcached_io_write(memcached_server_st *ptr,
while (offset < size)
{
- ssize_t nread= memcached_io_read(ptr, data + offset, size - offset);
- if (nread <= 0)
- {
- memcached_io_reset(ptr);
- return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
+ ssize_t nread;
+ memcached_return rc= memcached_io_read(ptr, data + offset, size - offset,
+ &nread);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
+
offset+= nread;
}
* buffer. Call the standard read function to avoid duplicating
* the logic.
*/
- if (memcached_io_read(ptr, buffer_ptr, 1) != 1)
- return MEMCACHED_UNKNOWN_READ_FAILURE;
+ ssize_t nread;
+ memcached_return rc= memcached_io_read(ptr, buffer_ptr, 1, &nread);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
if (*buffer_ptr == '\n')
line_complete= true;