X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_hosts.c;h=8cc5f3e612bec72a9641e132bf0d9aa50ead2308;hb=fa11f4a5d1a9c92eda13f8a5aa11dcff542b8815;hp=2f1c4cc032e09a15183ee2e2d3217579f2042ab6;hpb=ef9ddf55563059fcf3608bab479e15f28e9ceb0f;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c index 2f1c4cc0..8cc5f3e6 100644 --- a/libmemcached/memcached_hosts.c +++ b/libmemcached/memcached_hosts.c @@ -2,11 +2,11 @@ #include /* Protoypes (static) */ -static memcached_return server_add(memcached_st *ptr, const char *hostname, - unsigned int port, - uint32_t weight, - memcached_connection type); -memcached_return update_continuum(memcached_st *ptr); +static memcached_return_t server_add(memcached_st *ptr, const char *hostname, + in_port_t port, + uint32_t weight, + memcached_connection_t type); +memcached_return_t update_continuum(memcached_st *ptr); static int compare_servers(const void *p1, const void *p2) { @@ -29,20 +29,21 @@ static void sort_hosts(memcached_st *ptr) if (ptr->number_of_hosts) { qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers); - ptr->hosts[0].count= ptr->number_of_hosts; + ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts; } } -memcached_return run_distribution(memcached_st *ptr) +memcached_return_t run_distribution(memcached_st *ptr) { - switch (ptr->distribution) + switch (ptr->distribution) { case MEMCACHED_DISTRIBUTION_CONSISTENT: case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA: + case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY: return update_continuum(ptr); case MEMCACHED_DISTRIBUTION_MODULA: - if (ptr->flags & MEM_USE_SORT_HOSTS) + if (ptr->flags.use_sort_hosts) sort_hosts(ptr); break; case MEMCACHED_DISTRIBUTION_RANDOM: @@ -51,6 +52,8 @@ memcached_return run_distribution(memcached_st *ptr) WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */ } + ptr->last_disconnected_server = NULL; + return MEMCACHED_SUCCESS; } @@ -77,7 +80,7 @@ void server_list_free(memcached_st *ptr, memcached_server_st *servers) static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment) { unsigned char results[16]; - + 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) @@ -100,7 +103,7 @@ static int continuum_item_cmp(const void *t1, const void *t2) return -1; } -memcached_return update_continuum(memcached_st *ptr) +memcached_return_t update_continuum(memcached_st *ptr) { uint32_t host_index; uint32_t continuum_index= 0; @@ -111,8 +114,8 @@ memcached_return update_continuum(memcached_st *ptr) uint32_t pointer_per_server= MEMCACHED_POINTS_PER_SERVER; uint32_t pointer_per_hash= 1; uint64_t total_weight= 0; - uint32_t is_ketama_weighted= 0; - uint32_t is_auto_ejecting= 0; + uint64_t is_ketama_weighted= 0; + uint64_t is_auto_ejecting= 0; uint32_t points_per_server= 0; uint32_t live_servers= 0; struct timeval now; @@ -146,7 +149,7 @@ memcached_return update_continuum(memcached_st *ptr) live_servers= ptr->number_of_hosts; is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - points_per_server= is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER; + points_per_server= (uint32_t) (is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER); if (live_servers == 0) return MEMCACHED_SUCCESS; @@ -155,7 +158,7 @@ memcached_return update_continuum(memcached_st *ptr) { memcached_continuum_item_st *new_ptr; - new_ptr= ptr->call_realloc(ptr, ptr->continuum, + new_ptr= ptr->call_realloc(ptr, ptr->continuum, sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server); if (new_ptr == 0) @@ -165,9 +168,9 @@ memcached_return update_continuum(memcached_st *ptr) ptr->continuum_count= live_servers + MEMCACHED_CONTINUUM_ADDITION; } - if (is_ketama_weighted) + if (is_ketama_weighted) { - for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) + for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) { if (list[host_index].weight == 0) { @@ -178,65 +181,111 @@ memcached_return update_continuum(memcached_st *ptr) } } - for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) + for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) { if (is_auto_ejecting && list[host_index].next_retry > now.tv_sec) continue; - if (is_ketama_weighted) + if (is_ketama_weighted) { float pct = (float)list[host_index].weight / (float)total_weight; - pointer_per_server= floorf(pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)live_servers + 0.0000000001) * 4; + pointer_per_server= (uint32_t) ((floorf((float) (pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)live_servers + 0.0000000001))) * 4); pointer_per_hash= 4; #ifdef DEBUG - printf("ketama_weighted:%s|%d|%llu|%u\n", - list[host_index].hostname, - list[host_index].port, - (unsigned long long)list[host_index].weight, + printf("ketama_weighted:%s|%d|%llu|%u\n", + list[host_index].hostname, + list[host_index].port, + (unsigned long long)list[host_index].weight, pointer_per_server); #endif } - for (pointer_index= 1; - pointer_index <= pointer_per_server / pointer_per_hash; - ++pointer_index) - { - char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= ""; - size_t sort_host_length; - if (list[host_index].port == MEMCACHED_DEFAULT_PORT) - { - sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, - "%s-%d", - list[host_index].hostname, - pointer_index - 1); - } - else + if (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY) + { + for (pointer_index= 0; + pointer_index < pointer_per_server / pointer_per_hash; + pointer_index++) { - sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, - "%s:%d-%d", - list[host_index].hostname, - list[host_index].port, pointer_index - 1); - } - WATCHPOINT_ASSERT(sort_host_length); + char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= ""; + size_t sort_host_length; + + // Spymemcached ketema key format is: hostname/ip:port-index + // If hostname is not available then: /ip:port-index + sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + "/%s:%d-%d", + list[host_index].hostname, + list[host_index].port, + pointer_index); +#ifdef DEBUG + printf("update_continuum: key is %s\n", sort_host); +#endif - if (is_ketama_weighted) - { - unsigned int i; - for (i = 0; i < pointer_per_hash; i++) + WATCHPOINT_ASSERT(sort_host_length); + + if (is_ketama_weighted) + { + unsigned int i; + for (i = 0; i < pointer_per_hash; i++) + { + value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i); + ptr->continuum[continuum_index].index= host_index; + ptr->continuum[continuum_index++].value= value; + } + } + else { - value= ketama_server_hash(sort_host, sort_host_length, i); + value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum); ptr->continuum[continuum_index].index= host_index; ptr->continuum[continuum_index++].value= value; } } - else + } + else + { + for (pointer_index= 1; + pointer_index <= pointer_per_server / pointer_per_hash; + pointer_index++) { - value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum); - ptr->continuum[continuum_index].index= host_index; - ptr->continuum[continuum_index++].value= value; + char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= ""; + size_t sort_host_length; + + if (list[host_index].port == MEMCACHED_DEFAULT_PORT) + { + sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + "%s-%d", + list[host_index].hostname, + pointer_index - 1); + } + else + { + sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + "%s:%d-%d", + list[host_index].hostname, + list[host_index].port, pointer_index - 1); + } + + WATCHPOINT_ASSERT(sort_host_length); + + if (is_ketama_weighted) + { + unsigned int i; + for (i = 0; i < pointer_per_hash; i++) + { + value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i); + 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->hash_continuum); + ptr->continuum[continuum_index].index= host_index; + ptr->continuum[continuum_index++].value= value; + } } } + pointer_counter+= pointer_per_server; } @@ -247,7 +296,7 @@ memcached_return update_continuum(memcached_st *ptr) qsort(ptr->continuum, ptr->continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp); #ifdef DEBUG - for (pointer_index= 0; ptr->number_of_hosts && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++) + for (pointer_index= 0; ptr->number_of_hosts && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++) { WATCHPOINT_ASSERT(ptr->continuum[pointer_index].value <= ptr->continuum[pointer_index + 1].value); } @@ -257,7 +306,7 @@ memcached_return update_continuum(memcached_st *ptr) } -memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list) +memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list) { unsigned int x; uint16_t count; @@ -267,7 +316,7 @@ memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l return MEMCACHED_SUCCESS; count= list[0].count; - new_host_list= ptr->call_realloc(ptr, ptr->hosts, + new_host_list= ptr->call_realloc(ptr, ptr->hosts, sizeof(memcached_server_st) * (count + ptr->number_of_hosts)); if (!new_host_list) @@ -277,32 +326,32 @@ memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l for (x= 0; x < count; x++) { - if ((ptr->flags & MEM_USE_UDP && list[x].type != MEMCACHED_CONNECTION_UDP) + if ((ptr->flags.use_udp && list[x].type != MEMCACHED_CONNECTION_UDP) || ((list[x].type == MEMCACHED_CONNECTION_UDP) - && ! (ptr->flags & MEM_USE_UDP)) ) + && ! (ptr->flags.use_udp)) ) return MEMCACHED_INVALID_HOST_PROTOCOL; WATCHPOINT_ASSERT(list[x].hostname[0] != 0); memcached_server_create(ptr, &ptr->hosts[ptr->number_of_hosts]); /* TODO check return type */ - (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname, + (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname, list[x].port, list[x].weight, list[x].type); ptr->number_of_hosts++; } - ptr->hosts[0].count= ptr->number_of_hosts; + ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts; return run_distribution(ptr); } -memcached_return memcached_server_add_unix_socket(memcached_st *ptr, - const char *filename) +memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, + const char *filename) { return memcached_server_add_unix_socket_with_weight(ptr, filename, 0); } -memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, - const char *filename, - uint32_t weight) +memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *ptr, + const char *filename, + uint32_t weight) { if (!filename) return MEMCACHED_FAILURE; @@ -310,41 +359,41 @@ memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, return server_add(ptr, filename, 0, weight, MEMCACHED_CONNECTION_UNIX_SOCKET); } -memcached_return memcached_server_add_udp(memcached_st *ptr, - const char *hostname, - unsigned int port) +memcached_return_t memcached_server_add_udp(memcached_st *ptr, + const char *hostname, + in_port_t port) { return memcached_server_add_udp_with_weight(ptr, hostname, port, 0); } -memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, - const char *hostname, - unsigned int port, - uint32_t weight) +memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr, + const char *hostname, + in_port_t port, + uint32_t weight) { if (!port) - port= MEMCACHED_DEFAULT_PORT; + port= MEMCACHED_DEFAULT_PORT; if (!hostname) - hostname= "localhost"; + hostname= "localhost"; return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_UDP); } -memcached_return memcached_server_add(memcached_st *ptr, - const char *hostname, - unsigned int port) +memcached_return_t memcached_server_add(memcached_st *ptr, + const char *hostname, + in_port_t port) { return memcached_server_add_with_weight(ptr, hostname, port, 0); } -memcached_return memcached_server_add_with_weight(memcached_st *ptr, - const char *hostname, - unsigned int port, - uint32_t weight) +memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, + const char *hostname, + in_port_t port, + uint32_t weight) { if (!port) - port= MEMCACHED_DEFAULT_PORT; + port= MEMCACHED_DEFAULT_PORT; if (!hostname) hostname= "localhost"; @@ -352,18 +401,18 @@ memcached_return memcached_server_add_with_weight(memcached_st *ptr, return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_TCP); } -static memcached_return server_add(memcached_st *ptr, const char *hostname, - unsigned int port, - uint32_t weight, - memcached_connection type) +static memcached_return_t server_add(memcached_st *ptr, const char *hostname, + in_port_t port, + uint32_t weight, + memcached_connection_t type) { memcached_server_st *new_host_list; - if ( (ptr->flags & MEM_USE_UDP && type != MEMCACHED_CONNECTION_UDP) - || ( (type == MEMCACHED_CONNECTION_UDP) && !(ptr->flags & MEM_USE_UDP) ) ) + if ( (ptr->flags.use_udp && type != MEMCACHED_CONNECTION_UDP) + || ( (type == MEMCACHED_CONNECTION_UDP) && (! ptr->flags.use_udp) ) ) return MEMCACHED_INVALID_HOST_PROTOCOL; - - new_host_list= ptr->call_realloc(ptr, ptr->hosts, + + new_host_list= ptr->call_realloc(ptr, ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1)); if (new_host_list == NULL) @@ -374,29 +423,29 @@ static memcached_return server_add(memcached_st *ptr, const char *hostname, /* TODO: Check return type */ (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, weight, type); ptr->number_of_hosts++; - ptr->hosts[0].count= ptr->number_of_hosts; + ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts; return run_distribution(ptr); } -memcached_return memcached_server_remove(memcached_server_st *st_ptr) +memcached_return_t memcached_server_remove(memcached_server_st *st_ptr) { uint32_t x, host_index; memcached_st *ptr= st_ptr->root; memcached_server_st *list= ptr->hosts; - for (x= 0, host_index= 0; x < ptr->number_of_hosts; x++) + for (x= 0, host_index= 0; x < ptr->number_of_hosts; x++) { - if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port) + 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++; - } + } } ptr->number_of_hosts= host_index; - if (st_ptr->address_info) + if (st_ptr->address_info) { freeaddrinfo(st_ptr->address_info); st_ptr->address_info= NULL; @@ -406,17 +455,17 @@ memcached_return memcached_server_remove(memcached_server_st *st_ptr) return MEMCACHED_SUCCESS; } -memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, - const char *hostname, unsigned int port, - memcached_return *error) +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, unsigned int port, - uint32_t weight, - memcached_return *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_st *new_host_list; @@ -425,14 +474,14 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s return NULL; if (!port) - port= MEMCACHED_DEFAULT_PORT; + port= MEMCACHED_DEFAULT_PORT; /* Increment count for hosts */ count= 1; if (ptr != NULL) { count+= ptr[0].count; - } + } new_host_list= (memcached_server_st *)realloc(ptr, sizeof(memcached_server_st) * count); if (!new_host_list) @@ -445,7 +494,7 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP); /* Backwards compatibility hack */ - new_host_list[0].count= count; + new_host_list[0].count= (uint16_t) count; *error= MEMCACHED_SUCCESS; return new_host_list;