projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for 0.29 release
[awesomized/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index fc785e25c58562bcae365e0ac02d7631f08fe8fe..fb201d4ed82c4f1f31233f1d8bd7ba279f91a3c8 100644
(file)
--- a/
libmemcached/memcached_behavior.c
+++ b/
libmemcached/memcached_behavior.c
@@
-5,7
+5,7
@@
#include <netinet/tcp.h>
/*
#include <netinet/tcp.h>
/*
- This function is used to modify the beha
b
ior of running client.
+ This function is used to modify the beha
v
ior of running client.
We quit all connections so we can reset the sockets.
*/
We quit all connections so we can reset the sockets.
*/
@@
-30,6
+30,9
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
ptr->io_bytes_watermark= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
ptr->io_bytes_watermark= (int32_t)data;
break;
+ case MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH:
+ ptr->io_key_prefetch = (int32_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;
break;
@@
-50,10
+53,18
@@
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);
break;
case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
memcached_quit(ptr);
break;
+ case MEMCACHED_BEHAVIOR_USE_UDP:
+ if (ptr->number_of_hosts)
+ return MEMCACHED_FAILURE;
+ set_behavior_flag(ptr, MEM_USE_UDP, data);
+ if (data)
+ set_behavior_flag(ptr,MEM_NOREPLY,data);
+ break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
memcached_quit(ptr);
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
memcached_quit(ptr);
@@
-92,6
+103,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:
@@
-136,6
+151,12
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
break;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
break;
+ case MEMCACHED_BEHAVIOR_NOREPLY:
+ set_behavior_flag(ptr, MEM_NOREPLY, data);
+ break;
+ case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+ set_behavior_flag(ptr, MEM_AUTO_EJECT_HOSTS, data);
+ break;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-149,11
+170,11
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
switch (flag)
{
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
switch (flag)
{
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
- temp_flag = ptr->io_msg_watermark;
- break;
+ return ptr->io_msg_watermark;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
- temp_flag = ptr->io_bytes_watermark;
- break;
+ 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;
@@
-169,6
+190,9
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
temp_flag= MEM_BUFFER_REQUESTS;
break;
case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
temp_flag= MEM_BUFFER_REQUESTS;
break;
+ case MEMCACHED_BEHAVIOR_USE_UDP:
+ temp_flag= MEM_USE_UDP;
+ break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
@@
-244,6
+268,12
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
temp_flag= MEM_HASH_WITH_PREFIX_KEY;
break;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
temp_flag= MEM_HASH_WITH_PREFIX_KEY;
break;
+ case MEMCACHED_BEHAVIOR_NOREPLY:
+ temp_flag= MEM_NOREPLY;
+ break;
+ case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+ temp_flag= MEM_AUTO_EJECT_HOSTS;
+ break;
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
@@
-251,6
+281,4
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return 1;
else
return 0;
return 1;
else
return 0;
-
- return MEMCACHED_SUCCESS;
}
}