Merge in additional checks on tests.

[m6w6/libmemcached] / libmemcached / io.c

diff --git a/libmemcached/io.c b/libmemcached/io.c
index 17de85725d32c28c36c540644056d807111666e7..3b5d44f570e2003313963a6c70a1600287f382ba 100644 (file)
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -12,6 +12,8 @@
 
 #include "common.h"
 
+#include <assert.h>
+
 typedef enum {
   MEM_READ,
   MEM_WRITE
@@ -55,14 +57,10 @@ static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
       return MEMCACHED_FAILURE;
   }
 
-  int timeout= ptr->root->poll_timeout;
-  if (ptr->root->flags.no_block == false)
-    timeout= -1;
-
   size_t loop_max= 5;
   while (--loop_max) // While loop is for ERESTART or EINTR
   {
-    error= poll(&fds, 1, timeout);
+    error= poll(&fds, 1, ptr->root->poll_timeout);
 
     switch (error)
     {
@@ -412,7 +410,6 @@ static ssize_t _io_write(memcached_server_write_instance_st ptr,
       sent_length= io_flush(ptr, &rc);
       if (sent_length == -1)
       {
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         return -1;
       }
 
@@ -622,6 +619,7 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
     if (ptr->type == MEMCACHED_CONNECTION_UDP)
       increment_udp_message_id(ptr);
 
+    assert(ptr->fd != -1);
     sent_length= send(ptr->fd, local_write_ptr, write_length, 0);
     if (sent_length == SOCKET_ERROR)
     {
@@ -659,10 +657,14 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
           fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           return -1;
         }
+      case ENOTCONN:
+      case EPIPE:
       default:
+        fprintf(stderr, "%s %u  %u %u\n", ptr->hostname, ptr->port, ptr->io_bytes_sent, ptr->server_failure_counter);
+        fprintf(stderr, "%s:%d (%s)(%s)\n", __FILE__, __LINE__,__func__, strerror(errno));fflush(stdout);
         memcached_quit_server(ptr, true);
         *error= MEMCACHED_ERRNO;
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
+        assert(ptr->fd == -1);
         return -1;
       }
     }