memcached_st *memcached_create(memcached_st *ptr)
{
- memcached_string_st *string_ptr;
- if (!ptr)
+ memcached_result_st *result_ptr;
+
+ if (ptr == NULL)
{
ptr= (memcached_st *)malloc(sizeof(memcached_st));
{
memset(ptr, 0, sizeof(memcached_st));
}
- string_ptr= memcached_string_create(ptr, &ptr->result_buffer, 0);
- WATCHPOINT_ASSERT(string_ptr);
- ptr->poll_timeout= -1;
+ result_ptr= memcached_result_create(ptr, &ptr->result);
+ WATCHPOINT_ASSERT(result_ptr);
+ ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+ ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
return ptr;
}
void memcached_free(memcached_st *ptr)
{
- if (ptr->hosts)
- {
- memcached_quit(ptr);
- memcached_server_list_free(ptr->hosts);
- ptr->hosts= NULL;
- }
+ /* If we have anything open, lets close it now */
+ memcached_quit(ptr);
+ server_list_free(ptr, ptr->hosts);
+ memcached_result_free(&ptr->result);
- memcached_string_free(&ptr->result_buffer);
+ if (ptr->on_cleanup)
+ ptr->on_cleanup(ptr);
if (ptr->is_allocated == MEMCACHED_ALLOCATED)
- free(ptr);
+ {
+ if (ptr->call_free)
+ ptr->call_free(ptr, ptr);
+ else
+ free(ptr);
+ }
else
ptr->is_allocated= MEMCACHED_USED;
}
*/
memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
{
- memcached_return rc;
+ memcached_return rc= MEMCACHED_SUCCESS;
memcached_st *new_clone;
if (ptr == NULL)
- return memcached_create(clone);
+ {
+ new_clone= memcached_create(clone);
+
+ if (ptr->on_clone)
+ ptr->on_clone(NULL, new_clone);
+
+ return new_clone;
+ }
+
+ if (ptr->is_allocated == MEMCACHED_USED)
+ {
+ WATCHPOINT_ASSERT(0);
+ return NULL;
+ }
new_clone= memcached_create(clone);
+
+ if (new_clone == NULL)
+ return NULL;
-
- rc= memcached_server_push(new_clone, ptr->hosts);
+ if (ptr->hosts)
+ rc= memcached_server_push(new_clone, ptr->hosts);
if (rc != MEMCACHED_SUCCESS)
{
new_clone->flags= ptr->flags;
- new_clone->number_of_hosts= ptr->number_of_hosts;
new_clone->send_size= ptr->send_size;
new_clone->recv_size= ptr->recv_size;
new_clone->poll_timeout= ptr->poll_timeout;
+ new_clone->distribution= ptr->distribution;
+ new_clone->hash= ptr->hash;
+ new_clone->user_data= ptr->user_data;
+
+ new_clone->on_clone= ptr->on_clone;
+ new_clone->on_cleanup= ptr->on_cleanup;
+ new_clone->call_free= ptr->call_free;
+ new_clone->call_malloc= ptr->call_malloc;
+ new_clone->call_realloc= ptr->call_realloc;
+
+ if (ptr->on_clone)
+ ptr->on_clone(ptr, new_clone);
return new_clone;
}