.use_udp= false,
.verify_key= false,
.tcp_keepalive= false,
- .load_from_file= false
-
+ .ping_service= false
}
};
self->user_data= NULL;
self->next_distribution_rebuild= 0;
- self->prefix_key_length= 0;
self->number_of_replicas= 0;
hash_ptr= hashkit_create(&self->distribution_hashkit);
if (! hash_ptr)
self->sasl.is_allocated= false;
self->error_messages= NULL;
+ self->prefix_key= NULL;
+ self->configure.filename= NULL;
return true;
}
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
+ memcached_array_free(ptr->prefix_key);
+ ptr->prefix_key= NULL;
+
memcached_error_free(ptr);
if (ptr->sasl.callbacks)
#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)
}
- if (source->prefix_key_length)
- {
- strcpy(new_clone->prefix_key, source->prefix_key);
- new_clone->prefix_key_length= source->prefix_key_length;
- }
+ new_clone->prefix_key= memcached_array_clone(new_clone, source->prefix_key);
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
if (source->sasl.callbacks)