X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_flush.c;h=9b9c4baca91c3efb181961abef7ecf69a2aa6d62;hb=a7db49095a0ed78a1418003a00eef6d483c0d854;hp=a3e1be0b191250810f906b83411a1b77c8ebb941;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index a3e1be0b..9b9c4bac 100644
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -1,37 +1,44 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
 {
   unsigned int x;
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  LIBMEMCACHED_MEMCACHED_FLUSH_START();
 
   rc= memcached_connect(ptr);
 
   if (rc != MEMCACHED_SUCCESS)
     rc= MEMCACHED_SOME_ERRORS;
 
+  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if (expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                            "flush_all %u\r\n", expiration);
+                            "flush_all %llu\r\n", (unsigned long long)expiration);
     else
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
-    if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
-    {
-      fprintf(stderr, "failed flush_all TCP\n");
 
+    if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
       return MEMCACHED_WRITE_FAILURE;
-    }
 
+    sent_length= memcached_io_write(ptr, x, buffer, send_length, 1);
+
+    if (sent_length == -1 || sent_length != send_length)
+      return MEMCACHED_WRITE_FAILURE;
+
+    if (ptr->flags & MEM_NO_BLOCK)
+      WATCHPOINT;
     rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
 
     if (rc != MEMCACHED_SUCCESS)
       rc= MEMCACHED_SOME_ERRORS;
   }
 
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
   return rc;
 }