X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fhosts.cc;h=80ba0339e5e41b175570a0f66557110a597e2191;hb=e4feb8020e04b12017c5827be98d96f5330c60e8;hp=410b38ff1496d4a63e0400dca63754a5bdabf3e8;hpb=548ffaf81bcd9b3a2c88770b29e5e0558f9baaa3;p=awesomized%2Flibmemcached diff --git a/libmemcached/hosts.cc b/libmemcached/hosts.cc index 410b38ff..80ba0339 100644 --- a/libmemcached/hosts.cc +++ b/libmemcached/hosts.cc @@ -36,6 +36,7 @@ */ #include +#include "libmemcached/assert.hpp" #include #include @@ -52,7 +53,7 @@ static int compare_servers(const void *p1, const void *p2) if (return_value == 0) { - return_value= (int) (a->port - b->port); + return_value= int(a->port() - b->port()); } return return_value; @@ -62,11 +63,7 @@ static void sort_hosts(memcached_st *ptr) { if (memcached_server_count(ptr)) { - memcached_server_write_instance_st instance; - - qsort(memcached_server_list(ptr), memcached_server_count(ptr), sizeof(memcached_server_st), compare_servers); - instance= memcached_server_instance_fetch(ptr, 0); - instance->number_of_hosts= memcached_server_count(ptr); + qsort(memcached_instance_list(ptr), memcached_server_count(ptr), sizeof(org::libmemcached::Instance), compare_servers); } } @@ -122,17 +119,22 @@ static int continuum_item_cmp(const void *t1, const void *t2) /* Why 153? Hmmm... */ WATCHPOINT_ASSERT(ct1->value != 153); if (ct1->value == ct2->value) + { return 0; + } else if (ct1->value > ct2->value) + { return 1; + } else + { return -1; + } } static memcached_return_t update_continuum(memcached_st *ptr) { uint32_t continuum_index= 0; - memcached_server_st *list; uint32_t pointer_counter= 0; uint32_t pointer_per_server= MEMCACHED_POINTS_PER_SERVER; uint32_t pointer_per_hash= 1; @@ -144,7 +146,7 @@ static memcached_return_t update_continuum(memcached_st *ptr) return memcached_set_errno(*ptr, errno, MEMCACHED_AT); } - list= memcached_server_list(ptr); + org::libmemcached::Instance* list= memcached_instance_list(ptr); /* count live servers (those without a retry delay set) */ bool is_auto_ejecting= _is_auto_eject_host(ptr); @@ -172,10 +174,9 @@ static memcached_return_t update_continuum(memcached_st *ptr) live_servers= memcached_server_count(ptr); } - uint64_t is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - uint32_t points_per_server= (uint32_t) (is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER); + uint32_t points_per_server= (uint32_t) (memcached_is_weighted_ketama(ptr) ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER); - if (not live_servers) + if (live_servers == 0) { return MEMCACHED_SUCCESS; } @@ -194,9 +195,10 @@ static memcached_return_t update_continuum(memcached_st *ptr) ptr->ketama.continuum= new_ptr; ptr->ketama.continuum_count= live_servers + MEMCACHED_CONTINUUM_ADDITION; } + assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum"); uint64_t total_weight= 0; - if (is_ketama_weighted) + if (memcached_is_weighted_ketama(ptr)) { for (uint32_t host_index = 0; host_index < memcached_server_count(ptr); ++host_index) { @@ -214,7 +216,7 @@ static memcached_return_t update_continuum(memcached_st *ptr) continue; } - if (is_ketama_weighted) + if (memcached_is_weighted_ketama(ptr)) { float pct= (float)list[host_index].weight / (float)total_weight; pointer_per_server= (uint32_t) ((::floor((float) (pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)live_servers + 0.0000000001))) * 4); @@ -223,7 +225,7 @@ static memcached_return_t update_continuum(memcached_st *ptr) { printf("ketama_weighted:%s|%d|%llu|%u\n", list[host_index].hostname, - list[host_index].port, + list[host_index].port(), (unsigned long long)list[host_index].weight, pointer_per_server); } @@ -236,21 +238,21 @@ static memcached_return_t update_continuum(memcached_st *ptr) pointer_index < pointer_per_server / pointer_per_hash; pointer_index++) { - char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= ""; + char sort_host[1 +MEMCACHED_NI_MAXHOST +1 +MEMCACHED_NI_MAXSERV +1 + MEMCACHED_NI_MAXSERV ]= ""; int sort_host_length; // Spymemcached ketema key format is: hostname/ip:port-index // If hostname is not available then: /ip:port-index - sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + sort_host_length= snprintf(sort_host, sizeof(sort_host), "/%s:%u-%u", list[host_index].hostname, - (uint32_t)list[host_index].port, + (uint32_t)list[host_index].port(), pointer_index); - if (sort_host_length >= MEMCACHED_MAX_HOST_SORT_LENGTH || sort_host_length < 0) + if (size_t(sort_host_length) >= sizeof(sort_host) or sort_host_length < 0) { return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, - memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)")); + memcached_literal_param("snprintf(sizeof(sort_host))")); } if (DEBUG) @@ -258,7 +260,7 @@ static memcached_return_t update_continuum(memcached_st *ptr) fprintf(stdout, "update_continuum: key is %s\n", sort_host); } - if (is_ketama_weighted) + if (memcached_is_weighted_ketama(ptr)) { for (uint32_t x= 0; x < pointer_per_hash; x++) { @@ -281,32 +283,32 @@ static memcached_return_t update_continuum(memcached_st *ptr) pointer_index <= pointer_per_server / pointer_per_hash; pointer_index++) { - char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= ""; + char sort_host[MEMCACHED_NI_MAXHOST +1 +MEMCACHED_NI_MAXSERV +1 +MEMCACHED_NI_MAXSERV]= ""; int sort_host_length; - if (list[host_index].port == MEMCACHED_DEFAULT_PORT) + if (list[host_index].port() == MEMCACHED_DEFAULT_PORT) { - sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + sort_host_length= snprintf(sort_host, sizeof(sort_host), "%s-%u", list[host_index].hostname, pointer_index - 1); } else { - sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, + sort_host_length= snprintf(sort_host, sizeof(sort_host), "%s:%u-%u", list[host_index].hostname, - (uint32_t)list[host_index].port, + (uint32_t)list[host_index].port(), pointer_index - 1); } - if (sort_host_length >= MEMCACHED_MAX_HOST_SORT_LENGTH || sort_host_length < 0) + if (size_t(sort_host_length) >= sizeof(sort_host) or sort_host_length < 0) { return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, - memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)")); + memcached_literal_param("snprintf(sizeof(sort_host)))")); } - if (is_ketama_weighted) + if (memcached_is_weighted_ketama(ptr)) { for (uint32_t x = 0; x < pointer_per_hash; x++) { @@ -327,9 +329,9 @@ static memcached_return_t update_continuum(memcached_st *ptr) pointer_counter+= pointer_per_server; } - WATCHPOINT_ASSERT(ptr); - WATCHPOINT_ASSERT(ptr->ketama.continuum); - WATCHPOINT_ASSERT(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE); + assert_msg(ptr, "Programmer Error, no valid ptr"); + assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum"); + assert_msg(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE, "invalid size information being given to qsort()"); ptr->ketama.continuum_points_counter= pointer_counter; qsort(ptr->ketama.continuum, ptr->ketama.continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp); @@ -344,43 +346,52 @@ static memcached_return_t update_continuum(memcached_st *ptr) return MEMCACHED_SUCCESS; } -static memcached_return_t server_add(memcached_st *ptr, +static memcached_return_t server_add(memcached_st *memc, const memcached_string_t& hostname, in_port_t port, uint32_t weight, memcached_connection_t type) { - assert_msg(ptr, "Programmer mistake, somehow server_add() was passed a NULL memcached_st"); + assert_msg(memc, "Programmer mistake, somehow server_add() was passed a NULL memcached_st"); + + if (memc->number_of_hosts) + { + assert(memcached_instance_list(memc)); + } + + if (memcached_instance_list(memc)) + { + assert(memc->number_of_hosts); + } - memcached_server_st *new_host_list= libmemcached_xrealloc(ptr, memcached_server_list(ptr), (ptr->number_of_hosts + 1), memcached_server_st); + uint32_t host_list_size= memc->number_of_hosts +1; + org::libmemcached::Instance* new_host_list= libmemcached_xrealloc(memc, memcached_instance_list(memc), host_list_size, org::libmemcached::Instance); if (new_host_list == NULL) { - return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); + return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); } - memcached_server_list_set(ptr, new_host_list); + memcached_instance_set(memc, new_host_list, host_list_size); + assert(memc->number_of_hosts == host_list_size); /* TODO: Check return type */ - memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr)); + org::libmemcached::Instance* instance= memcached_instance_fetch(memc, memcached_server_count(memc) -1); - if (__server_create_with(ptr, instance, hostname, port, weight, type) == NULL) + if (__instance_create_with(memc, instance, hostname, port, weight, type) == NULL) { - return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); + return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); } if (weight > 1) { - ptr->ketama.weighted= true; + if (memcached_is_consistent_distribution(memc)) + { + memcached_set_weighted_ketama(memc, true); + } } - ptr->number_of_hosts++; - - // @note we place the count in the bottom of the server list - instance= memcached_server_instance_fetch(ptr, 0); - memcached_servers_set_count(instance, memcached_server_count(ptr)); - - return run_distribution(ptr); + return run_distribution(memc); } @@ -391,50 +402,93 @@ memcached_return_t memcached_server_push(memcached_st *ptr, const memcached_serv return MEMCACHED_SUCCESS; } + uint32_t original_host_size= memcached_server_count(ptr); uint32_t count= memcached_server_list_count(list); + uint32_t host_list_size= count +original_host_size; - memcached_server_st *new_host_list; - new_host_list= libmemcached_xrealloc(ptr, memcached_server_list(ptr), (count + memcached_server_count(ptr)), memcached_server_st); + org::libmemcached::Instance* new_host_list= libmemcached_xrealloc(ptr, memcached_instance_list(ptr), host_list_size, org::libmemcached::Instance); if (new_host_list == NULL) { return MEMCACHED_MEMORY_ALLOCATION_FAILURE; } - memcached_server_list_set(ptr, new_host_list); + memcached_instance_set(ptr, new_host_list, host_list_size); - for (uint32_t x= 0; x < count; x++) + ptr->state.is_parsing= true; + for (uint32_t x= 0; x < count; ++x, ++original_host_size) { - memcached_server_write_instance_st instance; - WATCHPOINT_ASSERT(list[x].hostname[0] != 0); // We have extended the array, and now we will find it, and use it. - instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr)); + org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, original_host_size); WATCHPOINT_ASSERT(instance); memcached_string_t hostname= { memcached_string_make_from_cstr(list[x].hostname) }; - if (__server_create_with(ptr, instance, - hostname, - list[x].port, list[x].weight, list[x].type) == NULL) + if (__instance_create_with(ptr, instance, + hostname, + list[x].port, list[x].weight, list[x].type) == NULL) { + ptr->state.is_parsing= false; return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); } if (list[x].weight > 1) { - ptr->ketama.weighted= true; + memcached_set_weighted_ketama(ptr, true); } + } + ptr->state.is_parsing= false; + + return run_distribution(ptr); +} + +memcached_return_t memcached_instance_push(memcached_st *ptr, const struct org::libmemcached::Instance* list, uint32_t number_of_hosts) +{ + if (list == NULL) + { + return MEMCACHED_SUCCESS; + } + + uint32_t original_host_size= memcached_server_count(ptr); + uint32_t host_list_size= number_of_hosts +original_host_size; + org::libmemcached::Instance* new_host_list= libmemcached_xrealloc(ptr, memcached_instance_list(ptr), host_list_size, org::libmemcached::Instance); - ptr->number_of_hosts++; + if (new_host_list == NULL) + { + return MEMCACHED_MEMORY_ALLOCATION_FAILURE; } - // Provides backwards compatibility with server list. + memcached_instance_set(ptr, new_host_list, host_list_size); + + // We don't bother with lookups for this operation + ptr->state.is_parsing= true; + + // We use original_host_size since size will now point to the first new + // instance allocated. + for (uint32_t x= 0; x < number_of_hosts; ++x, ++original_host_size) { - memcached_server_write_instance_st instance; - instance= memcached_server_instance_fetch(ptr, 0); - instance->number_of_hosts= memcached_server_count(ptr); + WATCHPOINT_ASSERT(list[x].hostname[0] != 0); + + // We have extended the array, and now we will find it, and use it. + org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, original_host_size); + WATCHPOINT_ASSERT(instance); + + memcached_string_t hostname= { memcached_string_make_from_cstr(list[x].hostname) }; + if (__instance_create_with(ptr, instance, + hostname, + list[x].port(), list[x].weight, list[x].type) == NULL) + { + ptr->state.is_parsing= false; + return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); + } + + if (list[x].weight > 1) + { + memcached_set_weighted_ketama(ptr, true); + } } + ptr->state.is_parsing= false; return run_distribution(ptr); } @@ -455,9 +509,9 @@ memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *pt } memcached_string_t _filename= { memcached_string_make_from_cstr(filename) }; - if (memcached_is_valid_servername(_filename) == false) + if (memcached_is_valid_filename(_filename) == false) { - memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid filename for socket provided")); + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid filename for socket provided")); } return server_add(ptr, _filename, 0, weight, MEMCACHED_CONNECTION_UNIX_SOCKET); @@ -528,7 +582,7 @@ memcached_return_t memcached_server_add_parsed(memcached_st *ptr, in_port_t port, uint32_t weight) { - char buffer[NI_MAXHOST]; + char buffer[MEMCACHED_NI_MAXHOST]; memcpy(buffer, hostname, hostname_length); buffer[hostname_length]= 0;