projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix test case for weighted servers.
[m6w6/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index f61fba52e6b6b5db168dac0a6f00231df890a67e..5f68844041dc4f33be96988c6a63f0c06d337731 100644
(file)
--- a/
libmemcached/memcached_behavior.c
+++ b/
libmemcached/memcached_behavior.c
@@
-1,4
+1,5
@@
#include "common.h"
#include "common.h"
+#include <time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
@@
-9,7
+10,7
@@
We quit all connections so we can reset the sockets.
*/
We quit all connections so we can reset the sockets.
*/
-void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, uint64_t data)
+
static
void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, uint64_t data)
{
if (data)
ptr->flags|= temp_flag;
{
if (data)
ptr->flags|= temp_flag;
@@
-23,12
+24,21
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+ ptr->io_msg_watermark= (int32_t)data;
+ break;
+ case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+ ptr->io_bytes_watermark= (int32_t)data;
+ break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
ptr->rcv_timeout= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
ptr->rcv_timeout= (int32_t)data;
break;
+ case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
+ ptr->server_failure_limit= (uint32_t)data;
+ break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
break;
@@
-49,6
+59,10
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
{
ptr->distribution= (memcached_server_distribution)(data);
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
{
ptr->distribution= (memcached_server_distribution)(data);
+ if (ptr->distribution == MEMCACHED_DISTRIBUTION_RANDOM)
+ {
+ srandom(time(NULL));
+ }
run_distribution(ptr);
break;
}
run_distribution(ptr);
break;
}
@@
-115,6
+129,9
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
break;
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
+ case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+ set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
+ break;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-127,6
+144,12
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
switch (flag)
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+ temp_flag = ptr->io_msg_watermark;
+ break;
+ case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+ temp_flag = ptr->io_bytes_watermark;
+ break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
@@
-159,21
+182,27
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
return ptr->hash_continuum;
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
return ptr->hash_continuum;
+ case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
+ return ptr->server_failure_limit;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
temp_flag= MEM_USE_SORT_HOSTS;
break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
temp_flag= MEM_USE_SORT_HOSTS;
break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
- return (u
nsigned long long
)ptr->poll_timeout;
+ return (u
int64_t
)ptr->poll_timeout;
}
case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
{
}
case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
{
- return (u
nsigned long long
)ptr->connect_timeout;
+ return (u
int64_t
)ptr->connect_timeout;
}
case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
{
}
case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
{
- return (u
nsigned long long
)ptr->retry_timeout;
+ return (u
int64_t
)ptr->retry_timeout;
}
}
+ case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
+ return (uint64_t)ptr->snd_timeout;
+ case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
+ return (uint64_t)ptr->rcv_timeout;
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size;
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size;
@@
-208,6
+237,9
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
+ case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+ temp_flag= MEM_HASH_WITH_PREFIX_KEY;
+ break;
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */