projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add pragma
[m6w6/libmemcached]
/
libmemcached
/
behavior.c
diff --git
a/libmemcached/behavior.c
b/libmemcached/behavior.c
index 67a261d35d8ef9afa174266acb8bad0f38f95471..2b6ccdf9112fda235bb2dc163497b9b49fd712f4 100644
(file)
--- a/
libmemcached/behavior.c
+++ b/
libmemcached/behavior.c
@@
-12,8
+12,6
@@
#include "common.h"
#include <time.h>
#include <sys/types.h>
#include "common.h"
#include <time.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
static bool set_flag(uint64_t data)
{
static bool set_flag(uint64_t data)
{
@@
-55,6
+53,7
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
ptr->server_failure_limit= (uint32_t)data;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
ptr->server_failure_limit= (uint32_t)data;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
+ memcached_quit(ptr); // We need t shutdown all of the connections to make sure we do the correct protocol
if (data)
{
ptr->flags.verify_key= false;
if (data)
{
ptr->flags.verify_key= false;
@@
-87,6
+86,10
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
ptr->flags.tcp_nodelay= set_flag(data);
memcached_quit(ptr);
break;
ptr->flags.tcp_nodelay= set_flag(data);
memcached_quit(ptr);
break;
+ case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+ ptr->flags.tcp_keepalive= set_flag(data);
+ memcached_quit(ptr);
+ break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return memcached_behavior_set_distribution(ptr, (memcached_server_distribution_t)data);
case MEMCACHED_BEHAVIOR_KETAMA:
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return memcached_behavior_set_distribution(ptr, (memcached_server_distribution_t)data);
case MEMCACHED_BEHAVIOR_KETAMA:
@@
-114,7
+117,7
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
/**
@note We try to keep the same distribution going. This should be deprecated and rewritten.
*/
/**
@note We try to keep the same distribution going. This should be deprecated and rewritten.
*/
- return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
+ return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
}
case MEMCACHED_BEHAVIOR_HASH:
return memcached_behavior_set_key_hash(ptr, (memcached_hash_t)(data));
}
case MEMCACHED_BEHAVIOR_HASH:
return memcached_behavior_set_key_hash(ptr, (memcached_hash_t)(data));
@@
-153,6
+156,10
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
ptr->recv_size= (int32_t)data;
memcached_quit(ptr);
break;
ptr->recv_size= (int32_t)data;
memcached_quit(ptr);
break;
+ case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+ ptr->tcp_keepidle= (uint32_t)data;
+ memcached_quit(ptr);
+ break;
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
@@
-170,7
+177,7
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_CORK:
{
break;
case MEMCACHED_BEHAVIOR_CORK:
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
bool action= set_flag(data);
if (action == false)
bool action= set_flag(data);
if (action == false)
@@
-230,6
+237,11
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
+bool _is_auto_eject_host(const memcached_st *ptr)
+{
+ return ptr->flags.auto_eject_hosts;
+}
+
uint64_t memcached_behavior_get(memcached_st *ptr,
const memcached_behavior_t flag)
{
uint64_t memcached_behavior_get(memcached_st *ptr,
const memcached_behavior_t flag)
{
@@
-266,9
+278,9
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0;
case MEMCACHED_BEHAVIOR_HASH:
case MEMCACHED_BEHAVIOR_KETAMA:
return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0;
case MEMCACHED_BEHAVIOR_HASH:
- return hashkit_get_
base_
function(&ptr->hashkit);
+ return hashkit_get_function(&ptr->hashkit);
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
- return hashkit_get_
base_
function(&ptr->distribution_hashkit);
+ return hashkit_get_function(&ptr->distribution_hashkit);
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
return ptr->server_failure_limit;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
return ptr->server_failure_limit;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
@@
-283,11
+295,13
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return (uint64_t)ptr->snd_timeout;
case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
return (uint64_t)ptr->rcv_timeout;
return (uint64_t)ptr->snd_timeout;
case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
return (uint64_t)ptr->rcv_timeout;
+ case MEMCACHED_BEHAVIOR_TCP_KEEPIDLE:
+ return (uint64_t)ptr->tcp_keepidle;
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size= 0;
socklen_t sock_length= sizeof(int);
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size= 0;
socklen_t sock_length= sizeof(int);
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
if (ptr->send_size != -1) // If value is -1 then we are using the default
return (uint64_t) ptr->send_size;
if (ptr->send_size != -1) // If value is -1 then we are using the default
return (uint64_t) ptr->send_size;
@@
-299,11
+313,20
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
/* REFACTOR */
/* We just try the first host, and if it is down we return zero */
if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
/* REFACTOR */
/* We just try the first host, and if it is down we return zero */
if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
+ {
+ return 0;
+ }
+
+ if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
+ {
return 0;
return 0;
+ }
- if (getsockopt(instance->fd, SOL_SOCKET,
- SO_SNDBUF, &sock_size, &sock_length))
+ if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0)
+ {
+ ptr->cached_errno= errno;
return 0; /* Zero means error */
return 0; /* Zero means error */
+ }
}
return (uint64_t) sock_size;
}
return (uint64_t) sock_size;
@@
-312,25
+335,34
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
{
int sock_size= 0;
socklen_t sock_length= sizeof(int);
{
int sock_size= 0;
socklen_t sock_length= sizeof(int);
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
if (ptr->recv_size != -1) // If value is -1 then we are using the default
return (uint64_t) ptr->recv_size;
instance= memcached_server_instance_fetch(ptr, 0);
if (ptr->recv_size != -1) // If value is -1 then we are using the default
return (uint64_t) ptr->recv_size;
instance= memcached_server_instance_fetch(ptr, 0);
- /**
- @note REFACTOR
+ /**
+ @note REFACTOR
*/
if (instance)
{
/* We just try the first host, and if it is down we return zero */
if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
*/
if (instance)
{
/* We just try the first host, and if it is down we return zero */
if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
+ {
+ return 0;
+ }
+
+ if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
+ {
return 0;
return 0;
+ }
- if (getsockopt(instance->fd, SOL_SOCKET,
- SO_RCVBUF, &sock_size, &sock_length))
+ if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0)
+ {
+ ptr->cached_errno= errno;
return 0; /* Zero means error */
return 0; /* Zero means error */
+ }
}
}
@@
-348,6
+380,8
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return ptr->flags.randomize_replica_read;
case MEMCACHED_BEHAVIOR_CORK:
return ptr->flags.cork;
return ptr->flags.randomize_replica_read;
case MEMCACHED_BEHAVIOR_CORK:
return ptr->flags.cork;
+ case MEMCACHED_BEHAVIOR_TCP_KEEPALIVE:
+ return ptr->flags.tcp_keepalive;
case MEMCACHED_BEHAVIOR_MAX:
default:
WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */
case MEMCACHED_BEHAVIOR_MAX:
default:
WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */
@@
-382,25
+416,25
@@
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)
{
hashkit_return_t rc;
memcached_return_t memcached_behavior_set_key_hash(memcached_st *ptr, memcached_hash_t type)
{
hashkit_return_t rc;
- rc= hashkit_set_
base_
function(&ptr->hashkit, (hashkit_hash_algorithm_t)type);
+ rc= hashkit_set_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type);
return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
}
memcached_hash_t memcached_behavior_get_key_hash(memcached_st *ptr)
{
return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
}
memcached_hash_t memcached_behavior_get_key_hash(memcached_st *ptr)
{
- return (memcached_hash_t)hashkit_get_
base_
function(&ptr->hashkit);
+ return (memcached_hash_t)hashkit_get_function(&ptr->hashkit);
}
memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type)
{
hashkit_return_t rc;
}
memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type)
{
hashkit_return_t rc;
- rc= hashkit_set_
base_
function(&ptr->distribution_hashkit, (hashkit_hash_algorithm_t)type);
+ rc= hashkit_set_function(&ptr->distribution_hashkit, (hashkit_hash_algorithm_t)type);
return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
}
memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *ptr)
{
return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
}
memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *ptr)
{
- return (memcached_hash_t)hashkit_get_
base_
function(&ptr->distribution_hashkit);
+ return (memcached_hash_t)hashkit_get_function(&ptr->distribution_hashkit);
}
}