X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_flush.c;h=4e048d00260e279858493167f98e05831797b967;hb=1af835409ff66c8a2860d2d95aa72d7a7a817358;hp=1511adbe43ce0913f09cd1c9ee335e280e4b4db9;hpb=1d7f999b7d38db3308a0533a83fea23987fb0178;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_flush.c b/libmemcached/memcached_flush.c
index 1511adbe..4e048d00 100644
--- a/libmemcached/memcached_flush.c
+++ b/libmemcached/memcached_flush.c
@@ -1,12 +1,30 @@
 #include "common.h"
 
+static memcached_return memcached_flush_binary(memcached_st *ptr, 
+                                               time_t expiration);
+static memcached_return memcached_flush_textual(memcached_st *ptr, 
+                                                time_t expiration);
+
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
+{
+  memcached_return rc;
+
+  LIBMEMCACHED_MEMCACHED_FLUSH_START();
+  if (ptr->flags & MEM_BINARY_PROTOCOL)
+    rc= memcached_flush_binary(ptr, expiration);
+  else
+    rc= memcached_flush_textual(ptr, expiration);
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
+  return rc;
+}
+
+static memcached_return memcached_flush_textual(memcached_st *ptr, 
+                                                time_t expiration)
 {
   unsigned int x;
   size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-  LIBMEMCACHED_MEMCACHED_FLUSH_START();
 
   unlikely (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
@@ -26,6 +44,40 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
   }
 
-  LIBMEMCACHED_MEMCACHED_FLUSH_END();
+  return MEMCACHED_SUCCESS;
+}
+
+static memcached_return memcached_flush_binary(memcached_st *ptr, 
+                                               time_t expiration)
+{
+  unsigned int x;
+  protocol_binary_request_flush request= {.bytes= {0}};
+
+  unlikely (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  request.message.header.request.magic= (uint8_t)PROTOCOL_BINARY_REQ;
+  request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
+  request.message.header.request.extlen= 4;
+  request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
+  request.message.header.request.bodylen= htonl(request.message.header.request.extlen);
+  request.message.body.expiration= htonl(expiration);
+
+  for (x= 0; x < ptr->number_of_hosts; x++)
+  {
+    if (memcached_do(&ptr->hosts[x], request.bytes, 
+                     sizeof(request.bytes), 1) != MEMCACHED_SUCCESS) 
+    {
+      memcached_io_reset(&ptr->hosts[x]);
+      return MEMCACHED_WRITE_FAILURE;
+    } 
+  }
+
+  for (x= 0; x < ptr->number_of_hosts; x++)
+  {
+    if (memcached_server_response_count(&ptr->hosts[x]) > 0)
+       (void)memcached_response(&ptr->hosts[x], NULL, 0, NULL);
+  }
+
   return MEMCACHED_SUCCESS;
 }