X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fhosts.c;h=b98a18e86398c1fc559d7abf587fb588c480bdab;hb=2c51ea585ccfbf3a14fed6d28f9115292ad0e6fc;hp=7778735c9697b12a2e0410a811e1add3c5b1eb34;hpb=addf09c6f6cf93f980f3de9cf649258c965b2934;p=m6w6%2Flibmemcached diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c index 7778735c..b98a18e8 100644 --- a/libmemcached/hosts.c +++ b/libmemcached/hosts.c @@ -1,3 +1,14 @@ +/* LibMemcached + * Copyright (C) 2006-2010 Brian Aker + * All rights reserved. + * + * Use and distribution licensed under the BSD license. See + * the COPYING file in the parent directory for full text. + * + * Summary: + * + */ + #include "common.h" #include @@ -63,11 +74,12 @@ memcached_return_t run_distribution(memcached_st *ptr) return MEMCACHED_SUCCESS; } -static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment) +static uint32_t ketama_server_hash(const char *key, size_t key_length, uint32_t alignment) { unsigned char results[16]; - md5_signature((unsigned char*)key, key_length, results); + libhashkit_md5_signature((unsigned char*)key, key_length, results); + return ((uint32_t) (results[3 + alignment * 4] & 0xFF) << 24) | ((uint32_t) (results[2 + alignment * 4] & 0xFF) << 16) | ((uint32_t) (results[1 + alignment * 4] & 0xFF) << 8) @@ -146,8 +158,8 @@ static memcached_return_t update_continuum(memcached_st *ptr) { memcached_continuum_item_st *new_ptr; - new_ptr= ptr->call_realloc(ptr, ptr->continuum, - sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server); + new_ptr= libmemcached_realloc(ptr, ptr->continuum, + sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server); if (new_ptr == 0) return MEMCACHED_MEMORY_ALLOCATION_FAILURE; @@ -213,17 +225,16 @@ static memcached_return_t update_continuum(memcached_st *ptr) if (is_ketama_weighted) { - unsigned int i; - for (i = 0; i < pointer_per_hash; i++) + for (uint32_t x= 0; x < pointer_per_hash; x++) { - value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i); + value= ketama_server_hash(sort_host, sort_host_length, x); ptr->continuum[continuum_index].index= host_index; ptr->continuum[continuum_index++].value= value; } } else { - value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash); + value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length); ptr->continuum[continuum_index].index= host_index; ptr->continuum[continuum_index++].value= value; } @@ -258,17 +269,16 @@ static memcached_return_t update_continuum(memcached_st *ptr) if (is_ketama_weighted) { - unsigned int i; - for (i = 0; i < pointer_per_hash; i++) + for (uint32_t x = 0; x < pointer_per_hash; x++) { - value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i); + value= ketama_server_hash(sort_host, sort_host_length, x); ptr->continuum[continuum_index].index= host_index; ptr->continuum[continuum_index++].value= value; } } else { - value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash); + value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length); ptr->continuum[continuum_index].index= host_index; ptr->continuum[continuum_index++].value= value; } @@ -297,7 +307,6 @@ static memcached_return_t update_continuum(memcached_st *ptr) memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list) { - uint32_t x; uint32_t count; memcached_server_st *new_host_list; @@ -305,15 +314,15 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st return MEMCACHED_SUCCESS; count= memcached_servers_count(list); - new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr), - sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr))); + new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr), + sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr))); if (! new_host_list) return MEMCACHED_MEMORY_ALLOCATION_FAILURE; memcached_server_list_set(ptr, new_host_list); - for (x= 0; x < count; x++) + for (uint32_t x= 0; x < count; x++) { memcached_server_instance_st *instance; @@ -412,8 +421,8 @@ static memcached_return_t server_add(memcached_st *ptr, const char *hostname, || ( (type == MEMCACHED_CONNECTION_UDP) && (! ptr->flags.use_udp) ) ) return MEMCACHED_INVALID_HOST_PROTOCOL; - new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr), - sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1)); + new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr), + sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1)); if (new_host_list == NULL) return MEMCACHED_MEMORY_ALLOCATION_FAILURE; @@ -430,83 +439,3 @@ static memcached_return_t server_add(memcached_st *ptr, const char *hostname, return run_distribution(ptr); } - -/** - @todo allow lists to query themselves even if they lack a root -*/ -memcached_return_t memcached_server_remove(memcached_server_st *st_ptr) -{ - uint32_t x, host_index; - memcached_st *root= (memcached_st *)st_ptr->root; - memcached_server_st *list; - - if (root == NULL) - return MEMCACHED_FAILURE; - - list= memcached_server_list(root); - - for (x= 0, host_index= 0; x < memcached_server_count(root); x++) - { - if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port) - { - if (host_index != x) - memcpy(list+host_index, list+x, sizeof(memcached_server_st)); - host_index++; - } - } - root->number_of_hosts= host_index; - - if (st_ptr->address_info) - { - freeaddrinfo(st_ptr->address_info); - st_ptr->address_info= NULL; - } - run_distribution(root); - - return MEMCACHED_SUCCESS; -} - -memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, - const char *hostname, in_port_t port, - memcached_return_t *error) -{ - return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error); -} - -memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, - const char *hostname, in_port_t port, - uint32_t weight, - memcached_return_t *error) -{ - unsigned int count; - memcached_server_instance_st *new_host_list; - - if (hostname == NULL || error == NULL) - return NULL; - - if (! port) - port= MEMCACHED_DEFAULT_PORT; - - /* Increment count for hosts */ - count= 1; - if (ptr != NULL) - { - count+= memcached_servers_count(ptr); - } - - new_host_list= (memcached_server_instance_st *)realloc(ptr, sizeof(memcached_server_instance_st) * count); - if (!new_host_list) - { - *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE; - return NULL; - } - - /* TODO: Check return type */ - memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP); - - /* Backwards compatibility hack */ - memcached_servers_set_count(new_host_list, count); - - *error= MEMCACHED_SUCCESS; - return new_host_list; -}