Moved to using read() to see if I can trap problems reported for dead
memcached servers.
--- /dev/null
+Eirik A. Nygaard - IO Patch
+Cal Heldenbrand - Awesome feedback on performance
+Dustin Sallings - Insight into protocol
+Tobias Luetke - Performance Feedback
- data_read= recv(ptr->hosts[server_key].fd,
+ data_read= read(ptr->hosts[server_key].fd,
- MEMCACHED_MAX_BUFFER, 0);
if (data_read == -1)
{
switch (errno)
if (data_read == -1)
{
switch (errno)
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
{
size_t sent_length;
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
{
size_t sent_length;
char *write_ptr= ptr->write_buffer;
size_t write_length= ptr->write_buffer_offset;
unsigned int loop= 1;
char *write_ptr= ptr->write_buffer;
size_t write_length= ptr->write_buffer_offset;
unsigned int loop= 1;
if (ptr->write_buffer_offset == 0)
return 0;
if (ptr->write_buffer_offset == 0)
return 0;
while (write_length)
{
if (ptr->flags & MEM_NO_BLOCK)
while (write_length)
{
if (ptr->flags & MEM_NO_BLOCK)
- if ((sent_length= write(ptr->hosts[server_key].fd, write_ptr,
- write_length)) == -1)
+ if ((ssize_t)(sent_length= write(ptr->hosts[server_key].fd, write_ptr,
+ write_length)) == -1)
{
switch (errno)
{
case ENOBUFS:
case EAGAIN:
{
switch (errno)
{
case ENOBUFS:
case EAGAIN:
+ WATCHPOINT;
+ continue;
+ if (loop < 100)
- else
- {
- write_ptr+= sent_length;
- write_length-= sent_length;
- }
+
+ 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);
ptr->write_buffer_offset= 0;
ptr->write_buffer_offset= 0;