Trying to remove branch

[m6w6/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 8d0e5551be715b2081fc3cb902ad891277c43b3e..9874bb6ea45f66ad9a1876dabf7ae729ea53e633 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -1,10 +1,60 @@
-#include <memcached.h>
+#include "common.h"
 
 /*
-  When this is implemented you will be able to remove single hosts
-  from your current pool of hosts.
+  This closes all connections (forces flush of input as well).
+  
+  Maybe add a host specific, or key specific version? 
+  
+  The reason we send "quit" is that in case we have buffered IO, this 
+  will force data to be completed.
 */
-memcached_return memcached_quit(memcached_st *ptr, char *hostname, unsigned port)
+
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 {
-  return MEMCACHED_SUCCESS;
+  if (ptr->fd != -1)
+  {
+    if (io_death == 0)
+    {
+      memcached_return rc;
+      ssize_t read_length;
+      char buffer[MEMCACHED_MAX_BUFFER];
+
+      rc= memcached_do(ptr, "quit\r\n", 6, 1);
+      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
+
+      /* read until socket is closed, or there is an error
+       * closing the socket before all data is read
+       * results in server throwing away all data which is
+       * not read
+       */
+      while ((read_length=
+             memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
+            > 0)
+       {
+         ;
+       }
+      memcached_io_close(ptr);
+    }
+
+    ptr->fd= -1;
+    ptr->write_buffer_offset= 0;
+    ptr->read_buffer_length= 0;
+    ptr->read_ptr= ptr->read_buffer;
+    memcached_server_response_reset(ptr);
+  }
+}
+
+void memcached_quit(memcached_st *ptr)
+{
+  unsigned int x;
+
+  if (ptr->hosts == NULL || 
+      ptr->number_of_hosts == 0)
+    return;
+
+  if (ptr->hosts && ptr->number_of_hosts)
+  {
+    for (x= 0; x < ptr->number_of_hosts; x++)
+      memcached_quit_server(&ptr->hosts[x], 0);
+  }
 }