projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of latest - callback commit needed
[m6w6/libmemcached]
/
lib
/
memcached_behavior.c
diff --git
a/lib/memcached_behavior.c
b/lib/memcached_behavior.c
index fb04d72212fd4ecb1f7ed62a730b08c2785c667a..f7a89604fe0d3408fa0dd58661107d877b13f94b 100644
(file)
--- a/
lib/memcached_behavior.c
+++ b/
lib/memcached_behavior.c
@@
-26,18
+26,39
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
+ set_behavior_flag(ptr, MEM_SUPPORT_CAS, data);
+ break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
break;
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
break;
+ case MEMCACHED_BEHAVIOR_DISTRIBUTION:
+ ptr->distribution= *(memcached_server_distribution *)(data);
+ break;
case MEMCACHED_BEHAVIOR_HASH:
ptr->hash= *(memcached_hash *)(data);
break;
case MEMCACHED_BEHAVIOR_HASH:
ptr->hash= *(memcached_hash *)(data);
break;
+ case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
+ set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
+ break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ ptr->user_data= data;
+ break;
+ case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
+ {
+ int32_t timeout= (*((int32_t *)data));
+
+ ptr->poll_timeout= timeout;
+ break;
+ }
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
ptr->send_size= (*((int *)data));
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
ptr->send_size= (*((int *)data));
@@
-64,17
+85,35
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
switch (flag)
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
+ temp_flag= MEM_SUPPORT_CAS;
+ break;
+ case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
+ temp_flag= MEM_USE_CACHE_LOOKUPS;
+ break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
temp_flag= MEM_NO_BLOCK;
break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
temp_flag= MEM_NO_BLOCK;
break;
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ temp_flag= MEM_BUFFER_REQUESTS;
+ break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
+ case MEMCACHED_BEHAVIOR_DISTRIBUTION:
+ return ptr->distribution;
case MEMCACHED_BEHAVIOR_HASH:
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
case MEMCACHED_BEHAVIOR_HASH:
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ return 0;
+ //return (unsigned long long)ptr->user_data;
+ case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
+ {
+ return (unsigned long long)ptr->poll_timeout;
+ }
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size;
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
int sock_size;