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..
+ ** Try to purge the input buffer if we don't do any flow control in the
+ ** application layer (just sending a lot of data etc)
+ ** The test is moved down in the purge function to avoid duplication of
+ ** the test.
+ */
+ if (read_or_write == MEM_WRITE)
+ {
+ if (memcached_purge(ptr) != MEMCACHED_SUCCESS || memcached_purge(ptr) != MEMCACHED_STORED)
+ return MEMCACHED_FAILURE;
+ }
+#endif
+
error= poll(fds, 1, ptr->root->poll_timeout);
if (error == 1)
#endif
ssize_t memcached_io_read(memcached_server_st *ptr,
- char *buffer, size_t length)
+ void *buffer, size_t length)
{
char *buffer_ptr;
switch (errno)
{
case EAGAIN:
+ case EINTR:
{
memcached_return rc;
}
}
+ ptr->io_bytes_sent = 0;
ptr->read_data_length= data_read;
ptr->read_buffer_length= data_read;
ptr->read_ptr= ptr->read_buffer;
break;
}
- return (size_t)(buffer_ptr - buffer);
+ return (size_t)(buffer_ptr - (char*)buffer);
}
ssize_t memcached_io_write(memcached_server_st *ptr,
- const char *buffer, size_t length, char with_flush)
+ const void *buffer, size_t length, char with_flush)
{
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 original_length;
}
-memcached_return memcached_io_close(memcached_server_st *ptr, uint8_t io_death)
+memcached_return memcached_io_close(memcached_server_st *ptr)
{
+ int r;
+
+ if (ptr->fd == -1)
+ return MEMCACHED_SUCCESS;
+
/* in case of death shutdown to avoid blocking at close() */
+ if (1)
+ {
+ r= shutdown(ptr->fd, SHUT_RDWR);
- if (io_death)
- shutdown(ptr->fd, SHUT_RDWR);
- else
- close(ptr->fd);
+#ifdef HAVE_DEBUG
+ if (r && errno != ENOTCONN)
+ {
+ WATCHPOINT_NUMBER(ptr->fd);
+ WATCHPOINT_ERRNO(errno);
+ WATCHPOINT_ASSERT(errno);
+ }
+#endif
+ }
+
+ r= close(ptr->fd);
+#ifdef HAVE_DEBUG
+ if (r != 0)
+ WATCHPOINT_ERRNO(errno);
+#endif
return MEMCACHED_SUCCESS;
}
static ssize_t io_flush(memcached_server_st *ptr,
memcached_return *error)
{
- size_t sent_length;
+ ssize_t sent_length;
size_t return_length;
char *local_write_ptr= ptr->write_buffer;
size_t write_length= ptr->write_buffer_offset;
*error= MEMCACHED_SUCCESS;
+ WATCHPOINT_ASSERT(ptr->fd != -1);
+
if (ptr->write_buffer_offset == 0)
return 0;
/* Looking for memory overflows */
+#if defined(HAVE_DEBUG)
if (write_length == MEMCACHED_MAX_BUFFER)
WATCHPOINT_ASSERT(ptr->write_buffer == local_write_ptr);
WATCHPOINT_ASSERT((ptr->write_buffer + MEMCACHED_MAX_BUFFER) >= (local_write_ptr + write_length));
+#endif
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
{
- if ((ssize_t)(sent_length= write(ptr->fd, local_write_ptr,
- write_length)) == -1)
+#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_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)
{
switch (errno)
{
}
}
+ ptr->io_bytes_sent += sent_length;
+
local_write_ptr+= sent_length;
write_length-= sent_length;
return_length+= sent_length;
}
WATCHPOINT_ASSERT(write_length == 0);
- WATCHPOINT_ASSERT(return_length == ptr->write_buffer_offset);
+ // Need to study this assert() WATCHPOINT_ASSERT(return_length ==
+ // ptr->write_buffer_offset);
ptr->write_buffer_offset= 0;
return return_length;