X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=74e75706875451277f9971a9a163d97155a54d8e;hb=d5ffc30a6f369ea210e92e6a55333121d32b9a55;hp=33a80bab29693982e49ae0210b3fc08f18694095;hpb=26c1a71921b1468d56f6edaa7e6e3855ec1c879f;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c index 33a80bab..74e75706 100644 --- a/libmemcached/memcached.c +++ b/libmemcached/memcached.c @@ -41,6 +41,22 @@ void memcached_free(memcached_st *ptr) if (ptr->on_cleanup) ptr->on_cleanup(ptr); + if (ptr->continuum) + { + if (ptr->call_free) + ptr->call_free(ptr, ptr->continuum); + else + free(ptr->continuum); + } + + if (ptr->wheel) + { + if (ptr->call_free) + ptr->call_free(ptr, ptr->wheel); + else + free(ptr->wheel); + } + if (ptr->is_allocated == MEMCACHED_ALLOCATED) { if (ptr->call_free) @@ -105,6 +121,17 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr) new_clone->get_key_failure= ptr->get_key_failure; new_clone->delete_trigger= ptr->delete_trigger; + if (ptr->prefix_key[0] != 0) + strcpy(new_clone->prefix_key, ptr->prefix_key); + + rc= run_distribution(new_clone); + if (rc != MEMCACHED_SUCCESS) + { + memcached_free(new_clone); + + return NULL; + } + if (ptr->on_clone) ptr->on_clone(ptr, new_clone);