fds[0].fd= ptr->fd;
fds[0].events= flags;
+#ifdef NOT_DONE
/*
** We are going to block on write, but at least on Solaris we might block
** on write if we haven't read anything from our input buffer..
** the test.
*/
if (read_or_write == MEM_WRITE)
- memcached_purge(ptr);
+ {
+ if (memcached_purge(ptr) != MEMCACHED_SUCCESS || memcached_purge(ptr) != MEMCACHED_STORED)
+ return MEMCACHED_FAILURE;
+ }
+#endif
error= poll(fds, 1, ptr->root->poll_timeout);
while (length)
{
- uint8_t found_eof= 0;
if (!ptr->read_buffer_length)
{
ssize_t data_read;
}
else
{
- found_eof= 1;
- break;
+ /*
+ EOF. Any data received so far is incomplete
+ so discard it. This always reads by byte in case of TCP
+ and protocol enforcement happens at memcached_response()
+ looking for '\n'. We do not care for UDB which requests 8 bytes
+ at once. Generally, this means that connection went away. Since
+ for blocking I/O we do not return 0 and for non-blocking case
+ it will return EGAIN if data is not immediatly available.
+ */
+ memcached_quit_server(ptr, 1);
+ return -1;
}
}
buffer_ptr++;
break;
}
-
- if (found_eof)
- break;
}
return (size_t)(buffer_ptr - (char*)buffer);
size_t original_length;
const char* buffer_ptr;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
+
original_length= length;
buffer_ptr= buffer;
memcached_return rc;
ssize_t sent_length;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
sent_length= io_flush(ptr, &rc);
if (sent_length == -1)
return -1;
if (with_flush)
{
memcached_return rc;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
if (io_flush(ptr, &rc) == -1)
return -1;
}
return MEMCACHED_SUCCESS;
/* in case of death shutdown to avoid blocking at close() */
- r= shutdown(ptr->fd, SHUT_RDWR);
+ if (1)
+ {
+ r= shutdown(ptr->fd, SHUT_RDWR);
#ifdef HAVE_DEBUG
- if (r && errno != ENOTCONN)
- {
- WATCHPOINT_NUMBER(ptr->fd);
- WATCHPOINT_ERRNO(errno);
- WATCHPOINT_ASSERT(errno);
- }
+ if (r && errno != ENOTCONN)
+ {
+ WATCHPOINT_NUMBER(ptr->fd);
+ WATCHPOINT_ERRNO(errno);
+ WATCHPOINT_ASSERT(errno);
+ }
#endif
+ }
r= close(ptr->fd);
#ifdef HAVE_DEBUG
*error= MEMCACHED_SUCCESS;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
+
if (ptr->write_buffer_offset == 0)
return 0;
return_length= 0;
while (write_length)
{
+ WATCHPOINT_ASSERT(ptr->fd != -1);
WATCHPOINT_ASSERT(write_length > 0);
sent_length= 0;
if (ptr->type == MEMCACHED_CONNECTION_UDP)
}
else
{
+#ifdef NOT_DONE
/*
** We might want to purge the input buffer if we haven't consumed
** any output yet... The test for the limits is the purge is inline
** in the purge function to avoid duplicating the logic..
*/
- memcached_purge(ptr);
+ {
+ memcached_return rc;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
+ rc= memcached_purge(ptr);
+ if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_STORED)
+ return -1;
+ }
+#endif
+
+ WATCHPOINT_ASSERT(ptr->fd != -1);
if ((sent_length= write(ptr->fd, local_write_ptr,
- write_length)) == -1)
+ write_length)) == -1)
{
switch (errno)
{
*/
void memcached_io_reset(memcached_server_st *ptr)
{
- memcached_quit_server(ptr, 0);
+ memcached_quit_server(ptr, 1);
}