memcached_st *memcached_create(memcached_st *ptr)
{
- memcached_result_st *result_ptr;
-
if (ptr == NULL)
{
ptr= (memcached_st *)calloc(1, sizeof(memcached_st));
memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL);
- result_ptr= memcached_result_create(ptr, &ptr->result);
- WATCHPOINT_ASSERT(result_ptr);
+ if (! memcached_result_create(ptr, &ptr->result))
+ {
+ memcached_free(ptr);
+ return NULL;
+ }
ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
ptr->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
ptr->retry_timeout= 0;
ptr->io_bytes_watermark= 65 * 1024;
WATCHPOINT_ASSERT_INITIALIZED(&ptr->result);
- WATCHPOINT_ASSERT_INITIALIZED(&ptr->hashkit);
return ptr;
}
+void server_list_free(memcached_st *ptr, memcached_server_st *servers)
+{
+ uint32_t x;
+
+ if (servers == NULL)
+ return;
+
+ for (x= 0; x < memcached_servers_count(servers); 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);
+ }
+}
+
+void memcached_servers_reset(memcached_st *ptr)
+{
+ server_list_free(ptr, memcached_server_list(ptr));
+
+ memcached_server_list_set(ptr, NULL);
+ ptr->number_of_hosts= 0;
+ ptr->last_disconnected_server= NULL;
+ ptr->server_failure_limit= 0;
+}
+
void memcached_free(memcached_st *ptr)
{
/* If we have anything open, lets close it now */
memcached_quit(ptr);
- server_list_free(ptr, ptr->hosts);
+ server_list_free(ptr, memcached_server_list(ptr));
memcached_result_free(&ptr->result);
if (ptr->on_cleanup)
*/
memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
{
- memcached_return rc= MEMCACHED_SUCCESS;
+ memcached_return_t rc= MEMCACHED_SUCCESS;
memcached_st *new_clone;
if (source == NULL)
new_clone->retry_timeout= source->retry_timeout;
new_clone->distribution= source->distribution;
new_clone->hash= source->hash;
- new_clone->hash_continuum= source->hash_continuum;
+ new_clone->distribution_hash= source->distribution_hash;
new_clone->user_data= source->user_data;
new_clone->snd_timeout= source->snd_timeout;
new_clone->io_key_prefetch= source->io_key_prefetch;
new_clone->number_of_replicas= source->number_of_replicas;
- if (source->hosts)
- rc= memcached_server_push(new_clone, source->hosts);
+ if (memcached_server_list(source))
+ rc= memcached_server_push(new_clone, memcached_server_list(source));
if (rc != MEMCACHED_SUCCESS)
{
}
rc= run_distribution(new_clone);
+
if (rc != MEMCACHED_SUCCESS)
{
memcached_free(new_clone);
return new_clone;
}
+
void *memcached_get_user_data(memcached_st *ptr)
{
return ptr->user_data;
{
void *ret= ptr->user_data;
ptr->user_data= data;
+
return ret;
}