X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_constants.h;h=ab64042142865a5034d8f5d51cb8d035070750be;hb=a242e3cff72d1db0ffde3edcf009a4506e619706;hp=0ee2568f3839a8c02e24a07a02dd56d347bba84e;hpb=2fe4e1635c70f4b2815aaf9bc147fee0b2c93de3;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_constants.h b/libmemcached/memcached_constants.h index 0ee2568f..ab640421 100644 --- a/libmemcached/memcached_constants.h +++ b/libmemcached/memcached_constants.h @@ -60,13 +60,13 @@ typedef enum { MEMCACHED_TIMEOUT, MEMCACHED_BUFFERED, MEMCACHED_BAD_KEY_PROVIDED, - MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ + MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */ } memcached_return; typedef enum { MEMCACHED_DISTRIBUTION_MODULA, MEMCACHED_DISTRIBUTION_CONSISTENT, - MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA, + MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA } memcached_server_distribution; typedef enum { @@ -89,6 +89,9 @@ typedef enum { MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, + MEMCACHED_BEHAVIOR_SND_TIMEOUT, + MEMCACHED_BEHAVIOR_RCV_TIMEOUT, + MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT } memcached_behavior; typedef enum { @@ -100,7 +103,7 @@ typedef enum { MEMCACHED_CALLBACK_REALLOC_FUNCTION, MEMCACHED_CALLBACK_FREE_FUNCTION, MEMCACHED_CALLBACK_GET_FAILURE, - MEMCACHED_CALLBACK_DELETE_TRIGGER, + MEMCACHED_CALLBACK_DELETE_TRIGGER } memcached_callback; typedef enum { @@ -112,20 +115,20 @@ typedef enum { MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_HSIEH, - MEMCACHED_HASH_MURMUR, + MEMCACHED_HASH_MURMUR } memcached_hash; typedef enum { MEMCACHED_CONNECTION_UNKNOWN, MEMCACHED_CONNECTION_TCP, MEMCACHED_CONNECTION_UDP, - MEMCACHED_CONNECTION_UNIX_SOCKET, + MEMCACHED_CONNECTION_UNIX_SOCKET } memcached_connection; typedef enum { MEMCACHED_NOT_ALLOCATED, MEMCACHED_ALLOCATED, - MEMCACHED_USED, + MEMCACHED_USED } memcached_allocated;