X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbehavior.cc;h=68e617d1410c6332b7d1bf5f9e69fd8efc072c18;hb=5d68a7b1d0fff81d547b8a74ad72247437f412c5;hp=330be0b8c757d93c397a0cae090aa7a4e08f0c31;hpb=d8dedbd561c7cb57daf4192fe57ce5e205bcadd7;p=m6w6%2Flibmemcached diff --git a/libmemcached/behavior.cc b/libmemcached/behavior.cc index 330be0b8..68e617d1 100644 --- a/libmemcached/behavior.cc +++ b/libmemcached/behavior.cc @@ -52,8 +52,10 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, const memcached_behavior_t flag, uint64_t data) { - if (not ptr) + if (ptr == NULL) + { return MEMCACHED_INVALID_ARGUMENTS; + } switch (flag) { @@ -85,7 +87,12 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, ptr->flags.auto_eject_hosts= bool(data); case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT: - ptr->server_failure_limit= (uint32_t)data; + if (data == 0) + { + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT requires a value greater then zero.")); + } + ptr->server_failure_limit= uint32_t(data); break; case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL: @@ -107,19 +114,26 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, break; case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS: + if (memcached_is_udp(ptr)) + { + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("MEMCACHED_BEHAVIOR_BUFFER_REQUESTS cannot be set while MEMCACHED_BEHAVIOR_USE_UDP is enabled.")); + } ptr->flags.buffer_requests= bool(data); send_quit(ptr); break; case MEMCACHED_BEHAVIOR_USE_UDP: - if (memcached_server_count(ptr)) + send_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol + ptr->flags.use_udp= bool(data); + if (bool(data)) { - return MEMCACHED_FAILURE; + ptr->flags.reply= false; + ptr->flags.buffer_requests= false; } - ptr->flags.use_udp= bool(data); - if (data) + else { - ptr->flags.no_reply= bool(data); + ptr->flags.reply= true; } break; @@ -139,7 +153,9 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_KETAMA: { if (data) // Turn on + { return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); + } return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_MODULA); } @@ -167,17 +183,17 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_VERIFY_KEY: if (ptr->flags.binary_protocol) + { return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("MEMCACHED_BEHAVIOR_VERIFY_KEY if the binary protocol has been enabled.")); + } ptr->flags.verify_key= bool(data); break; case MEMCACHED_BEHAVIOR_SORT_HOSTS: { ptr->flags.use_sort_hosts= bool(data); - run_distribution(ptr); - - break; + return run_distribution(ptr); } case MEMCACHED_BEHAVIOR_POLL_TIMEOUT: @@ -189,7 +205,16 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, break; case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT: - ptr->retry_timeout= (int32_t)data; + if (data == 0) + { + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("MEMCACHED_BEHAVIOR_RETRY_TIMEOUT requires a value greater then zero.")); + } + ptr->retry_timeout= int32_t(data); + break; + + case MEMCACHED_BEHAVIOR_DEAD_TIMEOUT: + ptr->dead_timeout= int32_t(data); break; case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE: @@ -212,11 +237,18 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, memcached_literal_param("MEMCACHED_BEHAVIOR_USER_DATA deprecated.")); case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY: - ptr->flags.hash_with_prefix_key= bool(data); + ptr->flags.hash_with_namespace= bool(data); break; case MEMCACHED_BEHAVIOR_NOREPLY: - ptr->flags.no_reply= bool(data); + if (memcached_is_udp(ptr) and bool(data) == false) + { + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("MEMCACHED_BEHAVIOR_NOREPLY cannot be disabled while MEMCACHED_BEHAVIOR_USE_UDP is enabled.")); + } + // We reverse the logic here to make it easier to understand throughout the + // code. + ptr->flags.reply= bool(data) ? false : true; break; case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS: @@ -238,10 +270,10 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_MAX: default: - /* Shouldn't get here */ - WATCHPOINT_ASSERT(0); - return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, - memcached_literal_param("Invalid behavior passed to memcached_behavior_set()")); + /* Shouldn't get here */ + assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"); + return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("Invalid behavior passed to memcached_behavior_set()")); } return MEMCACHED_SUCCESS; @@ -255,7 +287,7 @@ bool _is_auto_eject_host(const memcached_st *ptr) uint64_t memcached_behavior_get(memcached_st *ptr, const memcached_behavior_t flag) { - if (not ptr) + if (ptr == NULL) { return MEMCACHED_INVALID_ARGUMENTS; } @@ -290,7 +322,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return ptr->flags.buffer_requests; case MEMCACHED_BEHAVIOR_USE_UDP: - return ptr->flags.use_udp; + return memcached_is_udp(ptr); case MEMCACHED_BEHAVIOR_TCP_NODELAY: return ptr->flags.tcp_nodelay; @@ -329,6 +361,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr, case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT: return (uint64_t)ptr->retry_timeout; + case MEMCACHED_BEHAVIOR_DEAD_TIMEOUT: + return uint64_t(ptr->dead_timeout); + case MEMCACHED_BEHAVIOR_SND_TIMEOUT: return (uint64_t)ptr->snd_timeout; @@ -344,7 +379,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr, socklen_t sock_length= sizeof(int); if (ptr->send_size != -1) // If value is -1 then we are using the default + { return (uint64_t) ptr->send_size; + } memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0); @@ -364,7 +401,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0) { - memcached_set_errno(*ptr, errno, MEMCACHED_AT); + memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT); return 0; /* Zero means error */ } } @@ -400,10 +437,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr, if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0) { - memcached_set_errno(*ptr, errno, MEMCACHED_AT); + memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT); return 0; /* Zero means error */ } - } return (uint64_t) sock_size; @@ -415,10 +451,10 @@ uint64_t memcached_behavior_get(memcached_st *ptr, return 0; case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY: - return ptr->flags.hash_with_prefix_key; + return ptr->flags.hash_with_namespace; case MEMCACHED_BEHAVIOR_NOREPLY: - return ptr->flags.no_reply; + return ptr->flags.reply ? false : true; case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS: return ptr->flags.auto_eject_hosts; @@ -441,7 +477,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr, case MEMCACHED_BEHAVIOR_MAX: default: - WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */ + assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"); return 0; } @@ -461,9 +497,9 @@ memcached_return_t memcached_behavior_set_distribution(memcached_st *ptr, memcac { ptr->ketama.weighted= false; } + ptr->distribution= type; - run_distribution(ptr); - return MEMCACHED_SUCCESS; + return run_distribution(ptr); } return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, @@ -479,7 +515,9 @@ memcached_server_distribution_t memcached_behavior_get_distribution(memcached_st memcached_return_t memcached_behavior_set_key_hash(memcached_st *ptr, memcached_hash_t type) { if (hashkit_success(hashkit_set_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type))) + { return MEMCACHED_SUCCESS; + } return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid memcached_hash_t()")); @@ -524,6 +562,7 @@ const char *libmemcached_string_behavior(const memcached_behavior_t flag) case MEMCACHED_BEHAVIOR_VERIFY_KEY: return "MEMCACHED_BEHAVIOR_VERIFY_KEY"; case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT: return "MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT"; case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT: return "MEMCACHED_BEHAVIOR_RETRY_TIMEOUT"; + case MEMCACHED_BEHAVIOR_DEAD_TIMEOUT: return "MEMCACHED_BEHAVIOR_DEAD_TIMEOUT"; case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED: return "MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED"; case MEMCACHED_BEHAVIOR_KETAMA_HASH: return "MEMCACHED_BEHAVIOR_KETAMA_HASH"; case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL: return "MEMCACHED_BEHAVIOR_BINARY_PROTOCOL"; @@ -573,11 +612,15 @@ memcached_return_t memcached_bucket_set(memcached_st *self, { memcached_return_t rc; - if (not self) + if (self == NULL) + { return MEMCACHED_INVALID_ARGUMENTS; + } - if (not host_map) + if (host_map == NULL) + { return MEMCACHED_INVALID_ARGUMENTS; + } memcached_server_distribution_t old= memcached_behavior_get_distribution(self);