X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=3d2539eb4c25668358ded45085efe86f6130a8ec;hb=259ed7e68a0de0887e9aedbe0aa5fdd9404929f9;hp=396f34e6e8643379bab268f038ca7e3cd5ce8c7c;hpb=481efe3c437e1d87e0fabb987982cc1df2b2c35d;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 396f34e6..3d2539eb 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -1,15 +1,42 @@
-/* LibMemcached
- * Copyright (C) 2006-2010 Brian Aker
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2006-2009 Brian Aker All rights reserved.
  *
- * Summary:
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
-#include "common.h"
+#include <libmemcached/common.h>
+#include <libmemcached/virtual_bucket.h>
 
 static const memcached_st global_copy= {
   .state= {
@@ -22,26 +49,24 @@ static const memcached_st global_copy= {
     .binary_protocol= false,
     .buffer_requests= false,
     .hash_with_prefix_key= false,
-    .ketama_weighted= false,
     .no_block= false,
     .no_reply= false,
     .randomize_replica_read= false,
     .reuse_memory= false,
     .support_cas= false,
     .tcp_nodelay= false,
-    .use_cache_lookups= false,
     .use_sort_hosts= false,
     .use_udp= false,
     .verify_key= false,
     .tcp_keepalive= false,
-    .ping_service= false
-  }
+  },
 };
 
 static inline bool _memcached_init(memcached_st *self)
 {
   self->state= global_copy.state;
   self->flags= global_copy.flags;
+  self->virtual_bucket= NULL;
 
   self->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
@@ -50,7 +75,11 @@ static inline bool _memcached_init(memcached_st *self)
   if (! hash_ptr)
     return false;
 
+  self->ketama.continuum= NULL;
+  self->ketama.continuum_count= 0;
   self->ketama.continuum_points_counter= 0;
+  self->ketama.next_distribution_rebuild= 0;
+  self->ketama.weighted= false;
 
   self->number_of_hosts= 0;
   self->servers= NULL;
@@ -70,18 +99,15 @@ static inline bool _memcached_init(memcached_st *self)
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
   self->retry_timeout= 0;
-  self->ketama.continuum_count= 0;
 
   self->send_size= -1;
   self->recv_size= -1;
 
   self->user_data= NULL;
-  self->ketama.next_distribution_rebuild= 0;
   self->number_of_replicas= 0;
   hash_ptr= hashkit_create(&self->distribution_hashkit);
   if (! hash_ptr)
     return false;
-  self->ketama.continuum= NULL;
 
   self->allocators= memcached_allocators_return_default();
 
@@ -107,6 +133,8 @@ static void _free(memcached_st *ptr, bool release_st)
   memcached_server_list_free(memcached_server_list(ptr));
   memcached_result_free(&ptr->result);
 
+  memcached_virtual_bucket_free(ptr);
+
   if (ptr->last_disconnected_server)
     memcached_server_free(ptr->last_disconnected_server);