.auto_eject_hosts= false,
.binary_protocol= false,
.buffer_requests= false,
- .cork= false,
.hash_with_prefix_key= false,
- .ketama_weighted= false,
.no_block= false,
.no_reply= false,
.randomize_replica_read= false,
.use_udp= false,
.verify_key= false,
.tcp_keepalive= false,
- .load_from_file= false
-
}
};
if (! hash_ptr)
return false;
- self->continuum_points_counter= 0;
+ self->ketama.continuum= NULL;
+ self->ketama.continuum_count= 0;
+ self->ketama.continuum_points_counter= 0;
+ self->ketama.next_distribution_rebuild= 0;
+ self->ketama.weighted= false;
self->number_of_hosts= 0;
self->servers= NULL;
self->tcp_keepidle= 0;
self->io_key_prefetch= 0;
- self->cached_errno= 0;
self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
self->retry_timeout= 0;
- self->continuum_count= 0;
self->send_size= -1;
self->recv_size= -1;
self->user_data= NULL;
- self->next_distribution_rebuild= 0;
self->number_of_replicas= 0;
hash_ptr= hashkit_create(&self->distribution_hashkit);
if (! hash_ptr)
return false;
- self->continuum= NULL;
self->allocators= memcached_allocators_return_default();
self->error_messages= NULL;
self->prefix_key= NULL;
+ self->configure.filename= NULL;
return true;
}
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
- if (ptr->continuum)
- libmemcached_free(ptr, ptr->continuum);
+ if (ptr->ketama.continuum)
+ libmemcached_free(ptr, ptr->ketama.continuum);
memcached_array_free(ptr->prefix_key);
ptr->prefix_key= NULL;
#endif
}
+ if (release_st)
+ {
+ memcached_array_free(ptr->configure.filename);
+ ptr->configure.filename= NULL;
+ }
+
if (memcached_is_allocated(ptr) && release_st)
{
libmemcached_free(ptr, ptr);
return ptr;
}
-void memcached_reset(memcached_st *ptr)
+memcached_st *memcached_create_with_options(const char *string, size_t length)
+{
+ memcached_st *self= memcached_create(NULL);
+
+ if (! self)
+ return NULL;
+
+ memcached_return_t rc;
+ if ((rc= memcached_parse_configuration(self, string, length)) != MEMCACHED_SUCCESS)
+ {
+ return self;
+ }
+
+ if (memcached_parse_filename(self))
+ {
+ rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+ }
+
+ return self;
+}
+
+memcached_return_t memcached_reset(memcached_st *ptr)
{
WATCHPOINT_ASSERT(ptr);
if (! ptr)
- return;
+ return MEMCACHED_INVALID_ARGUMENTS;
bool stored_is_allocated= memcached_is_allocated(ptr);
_free(ptr, false);
memcached_create(ptr);
memcached_set_allocated(ptr, stored_is_allocated);
+
+ if (ptr->configure.filename)
+ {
+ return memcached_parse_configure_file(ptr, memcached_param_array(ptr->configure.filename));
+ }
+
+ return MEMCACHED_SUCCESS;
}
void memcached_servers_reset(memcached_st *ptr)