Committing work for next release (got to do something over lunch aye?)

[m6w6/libmemcached] / lib / memcached_behavior.c

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 67a52fa8ac212c18bc9a37cbced1f1abe728aa06..853a33b322bcd891bd36cef64b11b94353df875a 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -26,12 +26,18 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
 {
   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);
     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;
@@ -41,6 +47,13 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_KETAMA:
     set_behavior_flag(ptr, MEM_USE_KETAMA, data);
     break;
+  case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
+    {
+      unsigned int timeout= (*((unsigned int *)data));
+
+      ptr->poll_timeout= timeout;
+      break;
+    }
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       ptr->send_size= (*((int *)data));
@@ -67,6 +80,9 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
 
   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;
@@ -76,11 +92,17 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
   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_POLL_TIMEOUT:
+    {
+      return (unsigned long long)ptr->poll_timeout;
+    }
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size;