X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=90d3a708aee4a414add1c1eaada8c430e2115f4e;hb=3107b89b4d3441929835e6f96fda841c76f704fe;hp=40f8e263e7f7f478d579de9a8e74ff26503e2fbe;hpb=6f42f1c77da54da0b19274cc0d6b6c9745e40de0;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c index 40f8e263..90d3a708 100644 --- a/libmemcached/memcached.c +++ b/libmemcached/memcached.c @@ -9,18 +9,24 @@ memcached_st *memcached_create(memcached_st *ptr) if (ptr == NULL) { - ptr= (memcached_st *)malloc(sizeof(memcached_st)); + ptr= (memcached_st *)calloc(1, sizeof(memcached_st)); - if (!ptr) + if (! ptr) + { return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */ + } - memset(ptr, 0, sizeof(memcached_st)); - ptr->is_allocated= MEMCACHED_ALLOCATED; + ptr->options.is_allocated= true; } else { memset(ptr, 0, sizeof(memcached_st)); } + + ptr->options.is_initialized= true; + + memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL); + result_ptr= memcached_result_create(ptr, &ptr->result); WATCHPOINT_ASSERT(result_ptr); ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT; @@ -28,6 +34,13 @@ memcached_st *memcached_create(memcached_st *ptr) ptr->retry_timeout= 0; ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA; + /* TODO, Document why we picked these defaults */ + ptr->io_msg_watermark= 500; + ptr->io_bytes_watermark= 65 * 1024; + + WATCHPOINT_ASSERT_INITIALIZED(&ptr->result); + WATCHPOINT_ASSERT_INITIALIZED(&ptr->hashkit); + return ptr; } @@ -42,50 +55,71 @@ void memcached_free(memcached_st *ptr) ptr->on_cleanup(ptr); if (ptr->continuum) - { - if (ptr->call_free) - ptr->call_free(ptr, ptr->continuum); - else - free(ptr->continuum); - } + ptr->call_free(ptr, ptr->continuum); - if (ptr->is_allocated == MEMCACHED_ALLOCATED) + if (memcached_is_allocated(ptr)) { - if (ptr->call_free) - ptr->call_free(ptr, ptr); - else - free(ptr); + ptr->call_free(ptr, ptr); } else - ptr->is_allocated= MEMCACHED_USED; + { + ptr->options.is_initialized= false; + } } /* - clone is the destination, while ptr is the structure to clone. - If ptr is NULL the call is the same as if a memcached_create() was + clone is the destination, while source is the structure to clone. + If source is NULL the call is the same as if a memcached_create() was called. */ -memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr) +memcached_st *memcached_clone(memcached_st *clone, memcached_st *source) { - memcached_return rc= MEMCACHED_SUCCESS; + memcached_return_t rc= MEMCACHED_SUCCESS; memcached_st *new_clone; - if (ptr == NULL) + if (source == NULL) return memcached_create(clone); - if (ptr->is_allocated == MEMCACHED_USED) + if (clone && memcached_is_allocated(clone)) { - WATCHPOINT_ASSERT(0); return NULL; } - + new_clone= memcached_create(clone); - + if (new_clone == NULL) return NULL; - if (ptr->hosts) - rc= memcached_server_push(new_clone, ptr->hosts); + new_clone->flags= source->flags; + new_clone->send_size= source->send_size; + new_clone->recv_size= source->recv_size; + new_clone->poll_timeout= source->poll_timeout; + new_clone->connect_timeout= source->connect_timeout; + new_clone->retry_timeout= source->retry_timeout; + new_clone->distribution= source->distribution; + new_clone->hash= source->hash; + new_clone->distribution_hash= source->distribution_hash; + new_clone->user_data= source->user_data; + + new_clone->snd_timeout= source->snd_timeout; + new_clone->rcv_timeout= source->rcv_timeout; + + new_clone->on_clone= source->on_clone; + new_clone->on_cleanup= source->on_cleanup; + new_clone->call_free= source->call_free; + new_clone->call_malloc= source->call_malloc; + new_clone->call_realloc= source->call_realloc; + new_clone->call_calloc= source->call_calloc; + new_clone->get_key_failure= source->get_key_failure; + new_clone->delete_trigger= source->delete_trigger; + new_clone->server_failure_limit= source->server_failure_limit; + new_clone->io_msg_watermark= source->io_msg_watermark; + new_clone->io_bytes_watermark= source->io_bytes_watermark; + new_clone->io_key_prefetch= source->io_key_prefetch; + new_clone->number_of_replicas= source->number_of_replicas; + + if (source->hosts) + rc= memcached_server_push(new_clone, source->hosts); if (rc != MEMCACHED_SUCCESS) { @@ -95,35 +129,14 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr) } - new_clone->flags= ptr->flags; - new_clone->send_size= ptr->send_size; - new_clone->recv_size= ptr->recv_size; - new_clone->poll_timeout= ptr->poll_timeout; - new_clone->connect_timeout= ptr->connect_timeout; - new_clone->retry_timeout= ptr->retry_timeout; - new_clone->distribution= ptr->distribution; - new_clone->hash= ptr->hash; - new_clone->hash_continuum= ptr->hash_continuum; - new_clone->user_data= ptr->user_data; - - new_clone->snd_timeout= ptr->snd_timeout; - new_clone->rcv_timeout= ptr->rcv_timeout; - - new_clone->on_clone= ptr->on_clone; - new_clone->on_cleanup= ptr->on_cleanup; - new_clone->call_free= ptr->call_free; - new_clone->call_malloc= ptr->call_malloc; - new_clone->call_realloc= ptr->call_realloc; - new_clone->get_key_failure= ptr->get_key_failure; - new_clone->delete_trigger= ptr->delete_trigger; - - if (ptr->prefix_key[0] != 0) + if (source->prefix_key[0] != 0) { - strcpy(new_clone->prefix_key, ptr->prefix_key); - new_clone->prefix_key_length= ptr->prefix_key_length; + strcpy(new_clone->prefix_key, source->prefix_key); + new_clone->prefix_key_length= source->prefix_key_length; } rc= run_distribution(new_clone); + if (rc != MEMCACHED_SUCCESS) { memcached_free(new_clone); @@ -131,8 +144,21 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr) return NULL; } - if (ptr->on_clone) - ptr->on_clone(ptr, new_clone); + if (source->on_clone) + source->on_clone(source, new_clone); return new_clone; } + +void *memcached_get_user_data(memcached_st *ptr) +{ + return ptr->user_data; +} + +void *memcached_set_user_data(memcached_st *ptr, void *data) +{ + void *ret= ptr->user_data; + ptr->user_data= data; + + return ret; +}