return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
memset(ptr, 0, sizeof(memcached_server_st));
- ptr->is_allocated= MEMCACHED_ALLOCATED;
+ ptr->is_allocated= true;
}
else
- {
memset(ptr, 0, sizeof(memcached_server_st));
- }
ptr->root= memc;
return ptr;
}
+memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
+ const char *hostname, unsigned int port,
+ uint32_t weight, memcached_connection type)
+{
+ host= memcached_server_create(memc, host);
+
+ if (host == NULL)
+ return NULL;
+
+ strncpy(host->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
+ host->root= memc ? memc : NULL;
+ host->port= port;
+ host->weight= weight;
+ host->fd= -1;
+ host->type= type;
+ host->read_ptr= host->read_buffer;
+ if (memc)
+ host->next_retry= memc->retry_timeout;
+
+ return host;
+}
+
void memcached_server_free(memcached_server_st *ptr)
{
- if (ptr->is_allocated == MEMCACHED_ALLOCATED)
+ memcached_quit_server(ptr, 0);
+
+ if (ptr->address_info)
+ {
+ freeaddrinfo(ptr->address_info);
+ ptr->address_info= NULL;
+ }
+
+ if (ptr->is_allocated)
{
if (ptr->root && ptr->root->call_free)
ptr->root->call_free(ptr->root, ptr);
free(ptr);
}
else
- ptr->is_allocated= MEMCACHED_USED;
+ memset(ptr, 0, sizeof(memcached_server_st));
}
/*
*/
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
{
- memcached_server_st *new_clone;
-
/* We just do a normal create if ptr is missing */
if (ptr == NULL)
return NULL;
- if (clone && clone->is_allocated == MEMCACHED_USED)
- {
- WATCHPOINT_ASSERT(0);
- return NULL;
- }
-
- new_clone= memcached_server_create(ptr->root, clone);
-
- if (new_clone == NULL)
- return NULL;
-
- new_clone->root= ptr->root;
-
- host_reset(new_clone->root, new_clone,
- ptr->hostname, ptr->port,
- ptr->type);
-
- return new_clone;
+ /* TODO We should check return type */
+ return memcached_server_create_with(ptr->root, clone,
+ ptr->hostname, ptr->port, ptr->weight,
+ ptr->type);
}
memcached_return memcached_server_cursor(memcached_st *ptr,