Clean up interfaces so that 1.2 is a bit easier to upgrade too.

[m6w6/libmemcached] / libmemcached / instance.cc

diff --git a/libmemcached/instance.cc b/libmemcached/instance.cc
index ed840e55b31bdea89e77f288b8db8607b555f55d..ca3a30d8872ba4e7edc2051865724afdbb726d48 100644 (file)
--- a/libmemcached/instance.cc
+++ b/libmemcached/instance.cc
@@ -37,7 +37,7 @@
 
 #include <libmemcached/common.h>
 
-static inline void _server_init(org::libmemcached::Instance* self, memcached_st *root,
+static inline void _server_init(org::libmemcached::Instance* self, Memcached *root,
                                 const memcached_string_t& hostname,
                                 in_port_t port,
                                 uint32_t weight, memcached_connection_t type)
@@ -84,8 +84,7 @@ static inline void _server_init(org::libmemcached::Instance* self, memcached_st
     self->version= UINT_MAX;
   }
   self->limit_maxbytes= 0;
-  memcpy(self->hostname, hostname.c_str, hostname.size);
-  self->hostname[hostname.size]= 0;
+  self->hostname(hostname);
 }
 
 static org::libmemcached::Instance* _server_create(org::libmemcached::Instance* self, const memcached_st *memc)
@@ -160,11 +159,6 @@ org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
     memcached_io_init_udp_header(self, 0);
   }
 
-  if (memc)
-  {
-    memcached_connect_try(self);
-  }
-
   return self;
 }
 
@@ -172,12 +166,7 @@ void __instance_free(org::libmemcached::Instance* self)
 {
   memcached_quit_server(self, false);
 
-  if (self->address_info)
-  {
-    freeaddrinfo(self->address_info);
-    self->address_info= NULL;
-    self->address_info_next= NULL;
-  }
+  self->clear_addrinfo();
   assert(self->address_info_next == NULL);
 
   memcached_error_free(*self);
@@ -200,11 +189,12 @@ void memcached_instance_free(org::libmemcached::Instance* self)
   }
 }
 
-memcached_return_t memcached_server_cursor(const memcached_st* memc,
+memcached_return_t memcached_server_cursor(const memcached_st* shell,
                                            const memcached_server_fn *callback,
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
+  const Memcached* memc= memcached2Memcached(shell);
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_const_query(memc)))
   {
@@ -260,11 +250,12 @@ memcached_return_t memcached_server_execute(memcached_st *memc,
   return MEMCACHED_SUCCESS;
 }
 
-memcached_server_instance_st memcached_server_by_key(memcached_st *memc,
+memcached_server_instance_st memcached_server_by_key(memcached_st *shell,
                                                      const char *key,
                                                      size_t key_length,
                                                      memcached_return_t *error)
 {
+  Memcached* memc= memcached2Memcached(shell);
   memcached_return_t unused;
   if (error == NULL)
   {
@@ -300,10 +291,10 @@ static org::libmemcached::Instance* memcached_instance_clone(org::libmemcached::
     return NULL;
   }
 
-  memcached_string_t hostname= { memcached_string_make_from_cstr(source->hostname) };
+  memcached_string_t hostname_= { memcached_string_make_from_cstr(source->hostname()) };
   return __instance_create_with(source->root,
                                 NULL,
-                                hostname,
+                                hostname_,
                                 source->port(), source->weight,
                                 source->type);
 }
@@ -333,15 +324,15 @@ void set_last_disconnected_host(org::libmemcached::Instance* self)
   }
 }
 
-memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *shell)
 {
-  WATCHPOINT_ASSERT(self);
-  if (self == NULL)
+  const Memcached* self= memcached2Memcached(shell);
+  if (self)
   {
-    return 0;
+    return (memcached_server_instance_st)self->last_disconnected_server;
   }
 
-  return (memcached_server_instance_st)self->last_disconnected_server;
+  return 0;
 }
 
 void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)
@@ -352,3 +343,24 @@ void memcached_instance_next_retry(memcached_server_instance_st self, const time
     ((org::libmemcached::Instance*)self)->next_retry= absolute_time;
   }
 }
+
+namespace org {
+namespace libmemcached {
+
+  bool Instance::valid() const
+  {
+    if (fd == INVALID_SOCKET)
+    {
+      return false;
+    }
+
+    return true;
+  }
+
+  bool Instance::is_shutting_down() const
+  {
+    return options.is_shutting_down;
+  }
+
+} // namespace libmemcached
+} // namespace org