Merge Lee

[awesomized/libmemcached] / libmemcached / hosts.c

diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c
index 1cbc80305f4e0f2ba7011d4be2adbf62fb9b1de9..c6c9eb8e4a037366c247c1421cd77b96e7fc7cb8 100644 (file)
--- a/libmemcached/hosts.c
+++ b/libmemcached/hosts.c
@@ -146,8 +146,8 @@ static memcached_return_t update_continuum(memcached_st *ptr)
   {
     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);
+    new_ptr= libmemcached_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;
@@ -297,7 +297,6 @@ static memcached_return_t update_continuum(memcached_st *ptr)
 
 memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list)
 {
-  uint32_t x;
   uint32_t count;
   memcached_server_st *new_host_list;
 
@@ -305,15 +304,15 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
     return MEMCACHED_SUCCESS;
 
   count= memcached_servers_count(list);
-  new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr),
-                                   sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr)));
+  new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr),
+                                      sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr)));
 
   if (! new_host_list)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
   memcached_server_list_set(ptr, new_host_list);
 
-  for (x= 0; x < count; x++)
+  for (uint32_t x= 0; x < count; x++)
   {
     memcached_server_instance_st *instance;
 
@@ -326,7 +325,6 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
 
     instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
 
-    memcached_server_create(ptr, instance);
     /* TODO check return type */
     (void)memcached_server_create_with(ptr, instance, list[x].hostname,
                                        list[x].port, list[x].weight, list[x].type);
@@ -413,8 +411,8 @@ static memcached_return_t server_add(memcached_st *ptr, const char *hostname,
       || ( (type == MEMCACHED_CONNECTION_UDP) && (! ptr->flags.use_udp) ) )
     return MEMCACHED_INVALID_HOST_PROTOCOL;
 
-  new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr),
-                                   sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1));
+  new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr),
+                                      sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1));
 
   if (new_host_list == NULL)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
@@ -432,13 +430,21 @@ static memcached_return_t server_add(memcached_st *ptr, const char *hostname,
   return run_distribution(ptr);
 }
 
+/**
+  @todo allow lists to query themselves even if they lack a root
+*/
 memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
 {
   uint32_t x, host_index;
-  memcached_st *ptr= st_ptr->root;
-  memcached_server_st *list= memcached_server_list(ptr);
+  memcached_st *root= (memcached_st *)st_ptr->root;
+  memcached_server_st *list;
 
-  for (x= 0, host_index= 0; x < memcached_server_count(ptr); x++)
+  if (root == NULL)
+    return MEMCACHED_FAILURE;
+
+  list= memcached_server_list(root);
+
+  for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
   {
     if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port)
     {
@@ -447,14 +453,14 @@ memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
       host_index++;
     }
   }
-  ptr->number_of_hosts= host_index;
+  root->number_of_hosts= host_index;
 
   if (st_ptr->address_info)
   {
     freeaddrinfo(st_ptr->address_info);
     st_ptr->address_info= NULL;
   }
-  run_distribution(ptr);
+  run_distribution(root);
 
   return MEMCACHED_SUCCESS;
 }