memcached 1.2.6 → 1.2.7

data/ext/libmemcached-0.32/libmemcached/memcached_get.h

@@ -0,0 +1,87 @@
+/*
+ * Summary: Get functions for libmemcached
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Brian Aker
+ */
+
+#ifndef __MEMCACHED_GET_H__
+#define __MEMCACHED_GET_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GET_LEN_ARG_UNSPECIFIED -1U
+#define GET_LEN_BUFSZ 32
+
+/* Public defines */
+LIBMEMCACHED_API
+char *memcached_get(memcached_st *ptr, 
+                    const char *key, size_t key_length,
+                    size_t *value_length, 
+                    uint32_t *flags,
+                    memcached_return *error);
+
+LIBMEMCACHED_API
+char *memcached_get_len(memcached_st *ptr, 
+                        const char *key, size_t key_length,
+                        uint32_t user_spec_len,
+                        size_t *value_length, 
+                        uint32_t *flags,
+                        memcached_return *error);
+
+LIBMEMCACHED_API
+memcached_return memcached_mget(memcached_st *ptr, 
+                                const char **keys, size_t *key_length, 
+                                size_t number_of_keys);
+
+LIBMEMCACHED_API
+memcached_return memcached_mget_len(memcached_st *ptr, 
+                                    const char **keys, size_t *key_length, 
+                                    size_t number_of_keys, uint32_t user_spec_len);
+
+LIBMEMCACHED_API
+char *memcached_get_by_key(memcached_st *ptr, 
+                           const char *master_key, 
+                           size_t master_key_length, 
+                           const char *key, size_t key_length,
+                           uint32_t user_spec_len,
+                           size_t *value_length, 
+                           uint32_t *flags,
+                           memcached_return *error);
+
+LIBMEMCACHED_API
+memcached_return memcached_mget_by_key(memcached_st *ptr, 
+                                       const char *master_key, size_t 
+                                       master_key_length,
+                                       const char **keys, 
+                                       size_t *key_length, 
+                                       size_t number_of_keys,
+                                       uint32_t user_spec_len);
+
+LIBMEMCACHED_API
+char *memcached_fetch(memcached_st *ptr, 
+                      char *key, size_t *key_length, 
+                      size_t *value_length, uint32_t *flags, 
+                      memcached_return *error);
+
+LIBMEMCACHED_API
+memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+                                            memcached_result_st *result,
+                                            memcached_return *error);
+
+LIBMEMCACHED_API
+char *memcached_get_from_last(memcached_st *ptr,
+                              const char *key,
+                              size_t key_length,
+                              size_t *value_length, 
+                              uint32_t *flags,
+                              memcached_return *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MEMCACHED_GET_H__ */

data/ext/libmemcached-0.32/libmemcached/memcached_hash.c

@@ -0,0 +1,252 @@
+#include "common.h"
+
+
+/* Defines */
+static uint64_t FNV_64_INIT= UINT64_C(0xcbf29ce484222325);
+static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3);
+
+static uint32_t FNV_32_INIT= 2166136261UL;
+static uint32_t FNV_32_PRIME= 16777619;
+
+/* Prototypes */
+static uint32_t internal_generate_hash(const char *key, size_t key_length);
+static uint32_t internal_generate_md5(const char *key, size_t key_length);
+uint32_t memcached_live_host_index(memcached_st *ptr, uint32_t num);
+
+uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm)
+{
+  uint32_t hash= 1; /* Just here to remove compile warning */
+  uint32_t x= 0;
+
+  switch (hash_algorithm)
+  {
+  case MEMCACHED_HASH_DEFAULT:
+    hash= internal_generate_hash(key, key_length);
+    break;
+  case MEMCACHED_HASH_MD5:
+    hash= internal_generate_md5(key, key_length);
+    break;
+  case MEMCACHED_HASH_CRC:
+    hash= ((hash_crc32(key, key_length) >> 16) & 0x7fff);
+    if (hash == 0)
+      hash= 1;
+    break;
+    /* FNV hash'es lifted from Dustin Sallings work */
+  case MEMCACHED_HASH_FNV1_64:
+    {
+      /* Thanks to pierre@demartines.com for the pointer */
+      uint64_t temp_hash;
+
+      temp_hash= FNV_64_INIT;
+      for (x= 0; x < key_length; x++)
+      {
+        temp_hash *= FNV_64_PRIME;
+        temp_hash ^= (uint64_t)key[x];
+      }
+      hash= (uint32_t)temp_hash;
+    }
+    break;
+  case MEMCACHED_HASH_FNV1A_64:
+    {
+      hash= (uint32_t) FNV_64_INIT;
+      for (x= 0; x < key_length; x++)
+      {
+        uint32_t val= (uint32_t)key[x];
+        hash ^= val;
+        hash *= (uint32_t) FNV_64_PRIME;
+      }
+    }
+    break;
+  case MEMCACHED_HASH_FNV1_32:
+    {
+      hash= FNV_32_INIT;
+      for (x= 0; x < key_length; x++)
+      {
+        uint32_t val= (uint32_t)key[x];
+        hash *= FNV_32_PRIME;
+        hash ^= val;
+      }
+    }
+    break;
+  case MEMCACHED_HASH_FNV1A_32:
+    {
+      hash= FNV_32_INIT;
+      for (x= 0; x < key_length; x++)
+      {
+        uint32_t val= (uint32_t)key[x];
+        hash ^= val;
+        hash *= FNV_32_PRIME;
+      }
+    }
+    break;
+    case MEMCACHED_HASH_HSIEH:
+    {
+#ifdef HAVE_HSIEH_HASH
+      hash= hsieh_hash(key, key_length);
+#endif
+      break;
+    }
+    case MEMCACHED_HASH_MURMUR:
+    {
+      hash= murmur_hash(key, key_length);
+      break;
+    }
+    case MEMCACHED_HASH_JENKINS:
+    {
+      hash=jenkins_hash(key, key_length, 13);
+      break;
+    }
+    case MEMCACHED_HASH_NONE:
+    {
+      hash= 1;
+      break;
+    }
+    default:
+    {
+      WATCHPOINT_ASSERT(hash_algorithm);
+      break;
+    }
+  }
+  return hash;
+}
+
+uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length)
+{
+  uint32_t hash= 1; /* Just here to remove compile warning */
+
+
+  WATCHPOINT_ASSERT(ptr->number_of_hosts);
+
+  if (ptr->number_of_hosts == 1)
+    return 0;
+
+  hash= memcached_generate_hash_value(key, key_length, ptr->hash);
+  WATCHPOINT_ASSERT(hash);
+  return hash;
+}
+
+static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
+{
+  switch (ptr->distribution)
+  {
+  case MEMCACHED_DISTRIBUTION_CONSISTENT:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+    {
+      uint32_t num= ptr->continuum_points_counter;
+      WATCHPOINT_ASSERT(ptr->continuum);
+
+      hash= hash;
+      memcached_continuum_item_st *begin, *end, *left, *right, *middle;
+      begin= left= ptr->continuum;
+      end= right= ptr->continuum + num;
+
+      while (left < right)
+      {
+        middle= left + (right - left) / 2;
+        if (middle->value < hash)
+          left= middle + 1;
+        else
+          right= middle;
+      }
+      if (right == end)
+        right= begin;
+      return right->index;
+    }
+  case MEMCACHED_DISTRIBUTION_MODULA:
+    return memcached_live_host_index(ptr, hash);
+  case MEMCACHED_DISTRIBUTION_RANDOM:
+    return memcached_live_host_index(ptr, (uint32_t) random());
+  default:
+    WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
+    return hash % ptr->number_of_hosts;
+  }
+
+  /* NOTREACHED */
+}
+
+/*
+  One day make this public, and have it return the actual memcached_server_st
+  to the calling application.
+*/
+uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length)
+{
+  uint32_t hash= 1; /* Just here to remove compile warning */
+
+  WATCHPOINT_ASSERT(ptr->number_of_hosts);
+
+  if (ptr->number_of_hosts == 1)
+    return 0;
+
+  if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
+  {
+    size_t temp_length= ptr->prefix_key_length + key_length;
+    char temp[temp_length];
+
+    if (temp_length > MEMCACHED_MAX_KEY -1)
+      return 0;
+
+    strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
+    strncpy(temp + ptr->prefix_key_length, key, key_length);
+    hash= generate_hash(ptr, temp, temp_length);
+  }
+  else
+  {
+    hash= generate_hash(ptr, key, key_length);
+  }
+
+  WATCHPOINT_ASSERT(hash);
+
+  if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS) && ptr->next_distribution_rebuild) {
+    struct timeval now;
+
+    if (gettimeofday(&now, NULL) == 0 &&
+        now.tv_sec > ptr->next_distribution_rebuild)
+      run_distribution(ptr);
+  }
+
+  return dispatch_host(ptr, hash);
+}
+
+uint32_t memcached_live_host_index(memcached_st *ptr, uint32_t num)
+{
+  if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS)) {
+    if (ptr->number_of_live_hosts > 0) {
+      return ptr->live_host_indices[num % ptr->number_of_live_hosts];
+    } else {
+      return 0;  /* FIXME:  we should do something different if every server's dead, but I dunno what. */
+    }
+  } else {
+    return num % ptr->number_of_hosts;
+  }
+}
+
+static uint32_t internal_generate_hash(const char *key, size_t key_length)
+{
+  const char *ptr= key;
+  uint32_t value= 0;
+
+  while (key_length--)
+  {
+    uint32_t val= (uint32_t) *ptr++;
+    value += val;
+    value += (value << 10);
+    value ^= (value >> 6);
+  }
+  value += (value << 3);
+  value ^= (value >> 11);
+  value += (value << 15);
+
+  return value == 0 ? 1 : (uint32_t) value;
+}
+
+static uint32_t internal_generate_md5(const char *key, size_t key_length)
+{
+  unsigned char results[16];
+
+  md5_signature((unsigned char*)key, (unsigned int)key_length, results);
+
+  return ((uint32_t) (results[3] & 0xFF) << 24)
+    | ((uint32_t) (results[2] & 0xFF) << 16)
+    | ((uint32_t) (results[1] & 0xFF) << 8)
+    | (results[0] & 0xFF);
+}

data/ext/libmemcached-0.32/libmemcached/memcached_hosts.c

@@ -0,0 +1,510 @@
+#include "common.h"
+#include <math.h>
+
+/* Protoypes (static) */
+static memcached_return server_add(memcached_st *ptr, const char *hostname, 
+                                   unsigned int port,
+                                   uint32_t weight,
+                                   memcached_connection type);
+memcached_return update_continuum(memcached_st *ptr);
+memcached_return update_live_host_indices(memcached_st *ptr);
+
+static int compare_servers(const void *p1, const void *p2)
+{
+  int return_value;
+  memcached_server_st *a= (memcached_server_st *)p1;
+  memcached_server_st *b= (memcached_server_st *)p2;
+
+  return_value= strcmp(a->hostname, b->hostname);
+
+  if (return_value == 0)
+  {
+    return_value= (int) (a->port - b->port);
+  }
+
+  return return_value;
+}
+
+static void sort_hosts(memcached_st *ptr)
+{
+  if (ptr->number_of_hosts)
+  {
+    qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
+    ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+  }
+}
+
+
+memcached_return run_distribution(memcached_st *ptr)
+{
+  switch (ptr->distribution) 
+  {
+  case MEMCACHED_DISTRIBUTION_CONSISTENT:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+    return update_continuum(ptr);
+  case MEMCACHED_DISTRIBUTION_MODULA:
+    if (ptr->flags & MEM_USE_SORT_HOSTS)
+      sort_hosts(ptr);
+    if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS))
+      update_live_host_indices(ptr);
+    break;
+  case MEMCACHED_DISTRIBUTION_RANDOM:
+    if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS))
+      update_live_host_indices(ptr);
+    break;
+  default:
+    WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
+void server_list_free(memcached_st *ptr, memcached_server_st *servers)
+{
+  unsigned int x;
+
+  if (servers == NULL)
+    return;
+
+  for (x= 0; x < servers->count; x++)
+    if (servers[x].address_info)
+    {
+      freeaddrinfo(servers[x].address_info);
+      servers[x].address_info= NULL;
+    }
+
+  if (ptr)
+    ptr->call_free(ptr, servers);
+  else
+    free(servers);
+}
+
+static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
+{
+  unsigned char results[16];
+  
+  md5_signature((unsigned char*)key, key_length, results);
+  return ((uint32_t) (results[3 + alignment * 4] & 0xFF) << 24)
+    | ((uint32_t) (results[2 + alignment * 4] & 0xFF) << 16)
+    | ((uint32_t) (results[1 + alignment * 4] & 0xFF) << 8)
+    | (results[0 + alignment * 4] & 0xFF);
+}
+
+memcached_return update_live_host_indices(memcached_st *ptr)
+{
+  uint32_t host_index;
+  struct timeval now;
+  uint32_t i = 0;
+  memcached_server_st *list;
+
+  if (gettimeofday(&now, NULL) != 0)
+  {
+    ptr->cached_errno = errno;
+    return MEMCACHED_ERRNO;
+  }
+
+  if (ptr->live_host_indices == NULL) {
+    ptr->live_host_indices = (uint32_t *)ptr->call_malloc(ptr, sizeof(uint32_t) * ptr->number_of_hosts);
+    ptr->live_host_indices_size = ptr->number_of_live_hosts;
+  }
+
+  /* somehow we added some hosts.  Shouldn't get here much, if at all. */
+  if (ptr->live_host_indices_size < ptr->number_of_hosts ) {
+    ptr->live_host_indices = (uint32_t *)ptr->call_realloc(ptr, ptr->live_host_indices,  sizeof(uint32_t) * ptr->number_of_hosts);
+    ptr->live_host_indices_size = ptr->number_of_live_hosts;
+  }
+
+  if (ptr->live_host_indices == NULL)
+    return MEMCACHED_FAILURE;
+
+  list = ptr->hosts;
+  for (host_index= 0; host_index < ptr->number_of_hosts; ++host_index)
+    {
+      if (list[host_index].next_retry <= now.tv_sec) {
+        ptr->live_host_indices[i++] = host_index;
+      } else if (ptr->next_distribution_rebuild == 0 || list[host_index].next_retry < ptr->next_distribution_rebuild) {
+          ptr->next_distribution_rebuild= list[host_index].next_retry;
+      }
+    }
+  ptr->number_of_live_hosts = i;
+  return MEMCACHED_SUCCESS;
+}
+
+static int continuum_item_cmp(const void *t1, const void *t2)
+{
+  memcached_continuum_item_st *ct1= (memcached_continuum_item_st *)t1;
+  memcached_continuum_item_st *ct2= (memcached_continuum_item_st *)t2;
+
+  /* Why 153? Hmmm... */
+  WATCHPOINT_ASSERT(ct1->value != 153);
+  if (ct1->value == ct2->value)
+    return 0;
+  else if (ct1->value > ct2->value)
+    return 1;
+  else
+    return -1;
+}
+
+memcached_return update_continuum(memcached_st *ptr)
+{
+  uint32_t host_index;
+  uint32_t continuum_index= 0;
+  uint32_t value;
+  memcached_server_st *list;
+  uint32_t pointer_index;
+  uint32_t pointer_counter= 0;
+  uint32_t pointer_per_server= MEMCACHED_POINTS_PER_SERVER;
+  uint32_t pointer_per_hash= 1;
+  uint64_t total_weight= 0;
+  uint32_t is_ketama_weighted= 0;
+  uint32_t is_auto_ejecting= 0;
+  uint32_t points_per_server= 0;
+  uint32_t live_servers= 0;
+  struct timeval now;
+
+  if (gettimeofday(&now, NULL) != 0)
+  {
+    ptr->cached_errno = errno;
+    return MEMCACHED_ERRNO;
+  }
+
+  list = ptr->hosts;
+
+  /* count live servers (those without a retry delay set) */
+  is_auto_ejecting= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS);
+  if (is_auto_ejecting)
+  {
+    live_servers= 0;
+    ptr->next_distribution_rebuild= 0;
+    for (host_index= 0; host_index < ptr->number_of_hosts; ++host_index)
+    {
+      if (list[host_index].next_retry <= now.tv_sec)
+        live_servers++;
+      else
+      {
+        if (ptr->next_distribution_rebuild == 0 || list[host_index].next_retry < ptr->next_distribution_rebuild)
+          ptr->next_distribution_rebuild= list[host_index].next_retry;
+      }
+    }
+  }
+  else
+    live_servers= ptr->number_of_hosts;
+
+  is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
+  points_per_server= (uint32_t) (is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER);
+
+  if (live_servers == 0)
+    return MEMCACHED_SUCCESS;
+
+  if (live_servers > ptr->continuum_count)
+  {
+    memcached_continuum_item_st *new_ptr;
+
+    new_ptr= ptr->call_realloc(ptr, ptr->continuum, 
+                               sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server);
+
+    if (new_ptr == 0)
+      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+    ptr->continuum= new_ptr;
+    ptr->continuum_count= live_servers + MEMCACHED_CONTINUUM_ADDITION;
+  }
+
+  if (is_ketama_weighted) 
+  {
+    for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) 
+    {
+      if (list[host_index].weight == 0)
+      {
+        list[host_index].weight = 1;
+      }
+      if (!is_auto_ejecting || list[host_index].next_retry <= now.tv_sec)
+        total_weight += list[host_index].weight;
+    }
+  }
+
+  for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index) 
+  {
+    if (is_auto_ejecting && list[host_index].next_retry > now.tv_sec)
+      continue;
+
+    if (is_ketama_weighted) 
+    {
+        float pct = (float)list[host_index].weight / (float)total_weight;
+        pointer_per_server= (uint32_t) ((floorf((float) (pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)live_servers + 0.0000000001))) * 4);
+        pointer_per_hash= 4;
+#ifdef DEBUG
+        printf("ketama_weighted:%s|%d|%llu|%u\n", 
+               list[host_index].hostname, 
+               list[host_index].port,  
+               (unsigned long long)list[host_index].weight, 
+               pointer_per_server);
+#endif
+    }
+    for (pointer_index= 1;
+         pointer_index <= pointer_per_server / pointer_per_hash;
+         ++pointer_index) 
+    {
+      char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= "";
+      size_t sort_host_length;
+
+      if (list[host_index].port == MEMCACHED_DEFAULT_PORT)
+      {
+        sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
+                                            "%s-%d",
+                                            list[host_index].hostname,
+                                            pointer_index - 1);
+
+      }
+      else
+      {
+        sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
+                                            "%s:%d-%d", 
+                                            list[host_index].hostname,
+                                            list[host_index].port, pointer_index - 1);
+      }
+      WATCHPOINT_ASSERT(sort_host_length);
+
+      if (is_ketama_weighted)
+      {
+        unsigned int i;
+        for (i = 0; i < pointer_per_hash; i++)
+        {
+          value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+          ptr->continuum[continuum_index].index= host_index;
+          ptr->continuum[continuum_index++].value= value;
+        }
+      }
+      else
+      {
+        value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum);
+        ptr->continuum[continuum_index].index= host_index;
+        ptr->continuum[continuum_index++].value= value;
+      }
+    }
+    pointer_counter+= pointer_per_server;
+  }
+
+  WATCHPOINT_ASSERT(ptr);
+  WATCHPOINT_ASSERT(ptr->continuum);
+  WATCHPOINT_ASSERT(ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
+  ptr->continuum_points_counter= pointer_counter;
+  qsort(ptr->continuum, ptr->continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
+
+#ifdef DEBUG
+  for (pointer_index= 0; ptr->number_of_hosts && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++) 
+  {
+    WATCHPOINT_ASSERT(ptr->continuum[pointer_index].value <= ptr->continuum[pointer_index + 1].value);
+  }
+#endif
+
+  return MEMCACHED_SUCCESS;
+}
+
+
+memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list)
+{
+  unsigned int x;
+  uint16_t count;
+  memcached_server_st *new_host_list;
+
+  if (!list)
+    return MEMCACHED_SUCCESS;
+
+  count= list[0].count;
+  new_host_list= ptr->call_realloc(ptr, ptr->hosts, 
+                                   sizeof(memcached_server_st) * (count + ptr->number_of_hosts));
+
+  if (!new_host_list)
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+  ptr->hosts= new_host_list;
+
+  for (x= 0; x < count; x++)
+  {
+    if ((ptr->flags & MEM_USE_UDP && list[x].type != MEMCACHED_CONNECTION_UDP)
+            || ((list[x].type == MEMCACHED_CONNECTION_UDP)
+            && ! (ptr->flags & MEM_USE_UDP)) )
+      return MEMCACHED_INVALID_HOST_PROTOCOL;
+
+    WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
+    memcached_server_create(ptr, &ptr->hosts[ptr->number_of_hosts]);
+    /* TODO check return type */
+    (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname, 
+                                       list[x].port, list[x].weight, list[x].type);
+    ptr->number_of_hosts++;
+  }
+  ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+
+  return run_distribution(ptr);
+}
+
+memcached_return memcached_server_add_unix_socket(memcached_st *ptr, 
+                                                  const char *filename)
+{
+  return memcached_server_add_unix_socket_with_weight(ptr, filename, 0);
+}
+
+memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, 
+                                                              const char *filename, 
+                                                              uint32_t weight)
+{
+  if (!filename)
+    return MEMCACHED_FAILURE;
+
+  return server_add(ptr, filename, 0, weight, MEMCACHED_CONNECTION_UNIX_SOCKET);
+}
+
+memcached_return memcached_server_add_udp(memcached_st *ptr, 
+                                          const char *hostname,
+                                          unsigned int port)
+{
+  return memcached_server_add_udp_with_weight(ptr, hostname, port, 0);
+}
+
+memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, 
+                                                      const char *hostname,
+                                                      unsigned int port,
+                                                      uint32_t weight)
+{
+  if (!port)
+    port= MEMCACHED_DEFAULT_PORT; 
+
+  if (!hostname)
+    hostname= "localhost"; 
+
+  return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_UDP);
+}
+
+memcached_return memcached_server_add(memcached_st *ptr, 
+                                      const char *hostname, 
+                                      unsigned int port)
+{
+  return memcached_server_add_with_weight(ptr, hostname, port, 0);
+}
+
+memcached_return memcached_server_add_with_weight(memcached_st *ptr, 
+                                                  const char *hostname, 
+                                                  unsigned int port,
+                                                  uint32_t weight)
+{
+  if (!port)
+    port= MEMCACHED_DEFAULT_PORT; 
+
+  if (!hostname)
+    hostname= "localhost";
+
+  return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_TCP);
+}
+
+static memcached_return server_add(memcached_st *ptr, const char *hostname, 
+                                   unsigned int port,
+                                   uint32_t weight,
+                                   memcached_connection type)
+{
+  memcached_server_st *new_host_list;
+
+  if ( (ptr->flags & MEM_USE_UDP && type != MEMCACHED_CONNECTION_UDP)
+      || ( (type == MEMCACHED_CONNECTION_UDP) && !(ptr->flags & MEM_USE_UDP) ) )
+    return MEMCACHED_INVALID_HOST_PROTOCOL;
+  
+  new_host_list= ptr->call_realloc(ptr, ptr->hosts, 
+                                   sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
+
+  if (new_host_list == NULL)
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+  ptr->hosts= new_host_list;
+
+  /* TODO: Check return type */
+  (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, weight, type);
+  ptr->number_of_hosts++;
+  ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+
+  return run_distribution(ptr);
+}
+
+memcached_return memcached_server_remove(memcached_server_st *st_ptr)
+{
+  uint32_t x, host_index;
+  memcached_st *ptr= st_ptr->root;
+  memcached_server_st *list= ptr->hosts;
+
+  for (x= 0, host_index= 0; x < ptr->number_of_hosts; x++) 
+  {
+    if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port) 
+    {
+      if (host_index != x)
+        memcpy(list+host_index, list+x, sizeof(memcached_server_st));
+      host_index++;
+    } 
+  }
+  ptr->number_of_hosts= host_index;
+
+  if (st_ptr->address_info) 
+  {
+    freeaddrinfo(st_ptr->address_info);
+    st_ptr->address_info= NULL;
+  }
+  run_distribution(ptr);
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, 
+                                                  const char *hostname, unsigned int port,
+                                                  memcached_return *error)
+{
+  return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
+}
+
+memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, 
+                                                              const char *hostname, unsigned int port,
+                                                              uint32_t weight, 
+                                                              memcached_return *error)
+{
+  unsigned int count;
+  memcached_server_st *new_host_list;
+
+  if (hostname == NULL || error == NULL)
+    return NULL;
+
+  if (!port)
+    port= MEMCACHED_DEFAULT_PORT; 
+
+  /* Increment count for hosts */
+  count= 1;
+  if (ptr != NULL)
+  {
+    count+= ptr[0].count;
+  } 
+
+  new_host_list= (memcached_server_st *)realloc(ptr, sizeof(memcached_server_st) * count);
+  if (!new_host_list)
+  {
+    *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    return NULL;
+  }
+
+  /* TODO: Check return type */
+  memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP);
+
+  /* Backwards compatibility hack */
+  new_host_list[0].count= (uint16_t) count;
+
+  *error= MEMCACHED_SUCCESS;
+  return new_host_list;
+}
+
+unsigned int memcached_server_list_count(memcached_server_st *ptr)
+{
+  if (ptr == NULL)
+    return 0;
+
+  return ptr[0].count;
+}
+
+void memcached_server_list_free(memcached_server_st *ptr)
+{
+  server_list_free(NULL, ptr);
+}