projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Patrick's exception branch.
[m6w6/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index e8f65ddf6eb3a23d45c20feb47045600dff1d5d4..5241c3c8f7eb700c0206fb8388682afc7601bddb 100644
(file)
--- a/
libmemcached/memcached_behavior.c
+++ b/
libmemcached/memcached_behavior.c
@@
-24,11
+24,17
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
+ ptr->number_of_replicas= (uint32_t)data;
+ break;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
- ptr->io_msg_watermark= (
int32_t)
data;
+ ptr->io_msg_watermark= (
uint32_t)
data;
break;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
break;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
- ptr->io_bytes_watermark= (int32_t)data;
+ ptr->io_bytes_watermark= (uint32_t)data;
+ break;
+ case MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH:
+ ptr->io_key_prefetch = (uint32_t)data;
break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
@@
-50,6
+56,7
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
memcached_quit(ptr);
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
memcached_quit(ptr);
+ break;
case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
memcached_quit(ptr);
case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
memcached_quit(ptr);
@@
-70,7
+77,7
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
ptr->distribution= (memcached_server_distribution)(data);
if (ptr->distribution == MEMCACHED_DISTRIBUTION_RANDOM)
{
ptr->distribution= (memcached_server_distribution)(data);
if (ptr->distribution == MEMCACHED_DISTRIBUTION_RANDOM)
{
- srandom(time(NULL));
+ srandom(
(uint32_t)
time(NULL));
}
run_distribution(ptr);
break;
}
run_distribution(ptr);
break;
@@
-99,6
+106,10
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
}
case MEMCACHED_BEHAVIOR_HASH:
break;
}
case MEMCACHED_BEHAVIOR_HASH:
+#ifndef HAVE_HSIEH_HASH
+ if ((memcached_hash)(data) == MEMCACHED_HASH_HSIEH)
+ return MEMCACHED_FAILURE;
+#endif
ptr->hash= (memcached_hash)(data);
break;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
ptr->hash= (memcached_hash)(data);
break;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
@@
-145,7
+156,14
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_NOREPLY:
set_behavior_flag(ptr, MEM_NOREPLY, data);
break;
case MEMCACHED_BEHAVIOR_NOREPLY:
set_behavior_flag(ptr, MEM_NOREPLY, data);
- break;
+ break;
+ case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+ set_behavior_flag(ptr, MEM_AUTO_EJECT_HOSTS, data);
+ break;
+ default:
+ /* Shouldn't get here */
+ WATCHPOINT_ASSERT(flag);
+ break;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-154,14
+172,18
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
uint64_t memcached_behavior_get(memcached_st *ptr,
memcached_behavior flag)
{
uint64_t memcached_behavior_get(memcached_st *ptr,
memcached_behavior flag)
{
- memcached_flags temp_flag=
0
;
+ memcached_flags temp_flag=
MEM_NO_BLOCK
;
switch (flag)
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
+ return ptr->number_of_replicas;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
return ptr->io_msg_watermark;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
return ptr->io_bytes_watermark;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
return ptr->io_msg_watermark;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
return ptr->io_bytes_watermark;
+ case MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH:
+ return ptr->io_key_prefetch;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
@@
-192,7
+214,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return ptr->distribution;
case MEMCACHED_BEHAVIOR_KETAMA:
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return ptr->distribution;
case MEMCACHED_BEHAVIOR_KETAMA:
- return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? 1 : 0;
+ return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ?
(uint64_t)
1 : 0;
case MEMCACHED_BEHAVIOR_HASH:
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
case MEMCACHED_BEHAVIOR_HASH:
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA_HASH:
@@
-232,7
+254,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
SO_SNDBUF, &sock_size, &sock_length))
return 0; /* Zero means error */
SO_SNDBUF, &sock_size, &sock_length))
return 0; /* Zero means error */
- return sock_size;
+ return
(uint64_t)
sock_size;
}
case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
{
}
case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
{
@@
-248,7
+270,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
SO_RCVBUF, &sock_size, &sock_length))
return 0; /* Zero means error */
SO_RCVBUF, &sock_size, &sock_length))
return 0; /* Zero means error */
- return sock_size;
+ return
(uint64_t)
sock_size;
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
@@
-258,6
+280,12
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_NOREPLY:
temp_flag= MEM_NOREPLY;
break;
case MEMCACHED_BEHAVIOR_NOREPLY:
temp_flag= MEM_NOREPLY;
break;
+ case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+ temp_flag= MEM_AUTO_EJECT_HOSTS;
+ break;
+ default:
+ WATCHPOINT_ASSERT(flag);
+ break;
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */