X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fbehavior.c;h=ba4db7377d8899d87d053748ad71082969c43952;hb=42771008c1a69a2bfac10bbc89d00094d738e896;hp=509f42226d903b7a573c2185c7925aa1de753bbc;hpb=965bde2b42f5ef2dd7b55b6b4b74822e7cfaa1de;p=m6w6%2Flibmemcached

diff --git a/libmemcached/behavior.c b/libmemcached/behavior.c
index 509f4222..ba4db737 100644
--- a/libmemcached/behavior.c
+++ b/libmemcached/behavior.c
@@ -21,23 +21,6 @@ static bool set_flag(uint64_t data)
   return data ? true : false;
 }
 
-static memcached_return_t set_hash(memcached_hash_t *store, memcached_hash_t type)
-{
-#ifndef HAVE_HSIEH_HASH
-  if (type == MEMCACHED_HASH_HSIEH)
-    return MEMCACHED_FAILURE;
-#endif
-  if (type < MEMCACHED_HASH_MAX)
-  {
-    *store= type;
-  }
-  else
-  {
-    return MEMCACHED_FAILURE;
-  }
-
-  return MEMCACHED_SUCCESS;
-}
 /*
   This function is used to modify the behavior of running client.
 
@@ -90,7 +73,7 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
     memcached_quit(ptr);
     break;
   case MEMCACHED_BEHAVIOR_USE_UDP:
-    if (ptr->number_of_hosts)
+    if (memcached_server_count(ptr))
     {
       return MEMCACHED_FAILURE;
     }
@@ -185,12 +168,63 @@ memcached_return_t memcached_behavior_set(memcached_st *ptr,
       srandom((uint32_t) time(NULL));
       ptr->flags.randomize_replica_read= set_flag(data);
       break;
+  case MEMCACHED_BEHAVIOR_CORK:
+      {
+        memcached_server_instance_st *instance;
+        bool action= set_flag(data);
+
+        if (action == false)
+        {
+          ptr->flags.cork= set_flag(false);
+          return MEMCACHED_SUCCESS;
+        }
+
+        instance= memcached_server_instance_fetch(ptr, 0);
+        if (! instance)
+          return MEMCACHED_NO_SERVERS;
+
+
+        /* We just try the first host, and if it is down we return zero */
+        memcached_return_t rc;
+        rc= memcached_connect(instance);
+        if (rc != MEMCACHED_SUCCESS)
+        {
+          return rc;
+        }
+
+        /* Now we test! */
+        memcached_ternary_t enabled;
+        enabled= test_cork(instance, true);
+
+        switch (enabled)
+        {
+        case MEM_FALSE:
+          return ptr->cached_errno ? MEMCACHED_ERRNO : MEMCACHED_FAILURE ;
+        case MEM_TRUE:
+          {
+            enabled= test_cork(instance, false);
+
+            if (enabled == false) // Possible bug in OS?
+            {
+              memcached_quit_server(instance, false); // We should reset everything on this error.
+              return MEMCACHED_ERRNO;  // Errno will be true because we will have already set it.
+            }
+            ptr->flags.cork= true;
+            ptr->flags.tcp_nodelay= true;
+            memcached_quit(ptr); // We go on and reset the connections.
+          }
+          break;
+        case MEM_NOT:
+        default:
+          return MEMCACHED_NOT_SUPPORTED;
+        }
+      }
+      break;
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     /* Shouldn't get here */
     WATCHPOINT_ASSERT(0);
     return MEMCACHED_FAILURE;
-    break;
   }
 
   return MEMCACHED_SUCCESS;
@@ -232,9 +266,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_KETAMA:
     return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0;
   case MEMCACHED_BEHAVIOR_HASH:
-    return ptr->hash;
+    return hashkit_get_function(&ptr->hashkit);
   case MEMCACHED_BEHAVIOR_KETAMA_HASH:
-    return ptr->distribution_hash;
+    return hashkit_get_function(&ptr->distribution_hashkit);
   case MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT:
     return ptr->server_failure_limit;
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
@@ -251,35 +285,54 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return (uint64_t)ptr->rcv_timeout;
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
-      int sock_size;
+      int sock_size= 0;
       socklen_t sock_length= sizeof(int);
+      memcached_server_instance_st *instance;
+
+      if (ptr->send_size != -1) // If value is -1 then we are using the default
+        return (uint64_t) ptr->send_size;
 
-      /* REFACTOR */
-      /* We just try the first host, and if it is down we return zero */
-      if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS)
-        return 0;
+      instance= memcached_server_instance_fetch(ptr, 0);
+
+      if (instance) // If we have an instance we test, otherwise we just set and pray
+      {
+        /* REFACTOR */
+        /* We just try the first host, and if it is down we return zero */
+        if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
+          return 0;
 
-      if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
-                     SO_SNDBUF, &sock_size, &sock_length))
-        return 0; /* Zero means error */
+        if (getsockopt(instance->fd, SOL_SOCKET,
+                       SO_SNDBUF, &sock_size, &sock_length))
+          return 0; /* Zero means error */
+      }
 
       return (uint64_t) sock_size;
     }
   case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
     {
-      int sock_size;
+      int sock_size= 0;
       socklen_t sock_length= sizeof(int);
+      memcached_server_instance_st *instance;
+
+      if (ptr->recv_size != -1) // If value is -1 then we are using the default
+        return (uint64_t) ptr->recv_size;
+
+      instance= memcached_server_instance_fetch(ptr, 0);
 
       /** 
         @note REFACTOR 
       */
-      /* We just try the first host, and if it is down we return zero */
-      if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS)
-        return 0;
+      if (instance)
+      {
+        /* We just try the first host, and if it is down we return zero */
+        if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
+          return 0;
 
-      if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
-                     SO_RCVBUF, &sock_size, &sock_length))
-        return 0; /* Zero means error */
+        if (getsockopt(instance->fd, SOL_SOCKET,
+                       SO_RCVBUF, &sock_size, &sock_length))
+          return 0; /* Zero means error */
+
+      }
 
       return (uint64_t) sock_size;
     }
@@ -293,6 +346,8 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return ptr->flags.auto_eject_hosts;
   case MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ:
     return ptr->flags.randomize_replica_read;
+  case MEMCACHED_BEHAVIOR_CORK:
+    return ptr->flags.cork;
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */
@@ -326,20 +381,26 @@ memcached_server_distribution_t memcached_behavior_get_distribution(memcached_st
 
 memcached_return_t memcached_behavior_set_key_hash(memcached_st *ptr, memcached_hash_t type)
 {
-  return set_hash(&ptr->hash, type);
+  hashkit_return_t rc;
+  rc= hashkit_set_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type);
+
+  return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
 }
 
 memcached_hash_t memcached_behavior_get_key_hash(memcached_st *ptr)
 {
-  return ptr->hash;
+  return (memcached_hash_t)hashkit_get_function(&ptr->hashkit);
 }
 
 memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type)
 {
-  return set_hash(&ptr->distribution_hash, type);
+  hashkit_return_t rc;
+  rc= hashkit_set_function(&ptr->distribution_hashkit, (hashkit_hash_algorithm_t)type);
+
+  return rc == HASHKIT_SUCCESS ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
 }
 
 memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *ptr)
 {
-  return ptr->distribution_hash;
+  return (memcached_hash_t)hashkit_get_function(&ptr->distribution_hashkit);
 }