X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_server.c;h=2cff36da2eedf007a0c3d163137a2cf169151b77;hb=521e830fe336a17bee6e7376e3bf01a3b35ddc37;hp=fe132fe1ab0c29663c89edd23deb6d1b7703578d;hpb=defb3c5e4b25d32435b21a99eb85c016d0b1adc9;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c index fe132fe1..2cff36da 100644 --- a/libmemcached/memcached_server.c +++ b/libmemcached/memcached_server.c @@ -1,3 +1,14 @@ +/* LibMemcached + * Copyright (C) 2006-2009 Brian Aker + * All rights reserved. + * + * Use and distribution licensed under the BSD license. See + * the COPYING file in the parent directory for full text. + * + * Summary: String structure used for libmemcached. + * + */ + /* This is a partial implementation for fetching/creating memcached_server_st objects. */ @@ -7,28 +18,26 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve { if (ptr == NULL) { - ptr= (memcached_server_st *)malloc(sizeof(memcached_server_st)); + ptr= (memcached_server_st *)calloc(1, sizeof(memcached_server_st)); if (!ptr) return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */ - memset(ptr, 0, sizeof(memcached_server_st)); - ptr->is_allocated= MEMCACHED_ALLOCATED; + ptr->options.is_allocated= true; } else { - ptr->is_allocated= MEMCACHED_USED; 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) +memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, + const char *hostname, in_port_t port, + uint32_t weight, memcached_connection_t type) { host= memcached_server_create(memc, host); @@ -44,7 +53,11 @@ memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_ host->read_ptr= host->read_buffer; if (memc) host->next_retry= memc->retry_timeout; - host->sockaddr_inited= MEMCACHED_NOT_ALLOCATED; + if (type == MEMCACHED_CONNECTION_UDP) + { + host->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH; + memcached_io_init_udp_header(host, 0); + } return host; } @@ -53,18 +66,20 @@ void memcached_server_free(memcached_server_st *ptr) { memcached_quit_server(ptr, 0); + if (ptr->cached_server_error) + free(ptr->cached_server_error); + if (ptr->address_info) - { freeaddrinfo(ptr->address_info); - ptr->address_info= NULL; - } - if (ptr->is_allocated == MEMCACHED_ALLOCATED) + + if (memcached_is_allocated(ptr)) { - if (ptr->root && ptr->root->call_free) - ptr->root->call_free(ptr->root, ptr); - else - free(ptr); + ptr->root->call_free(ptr->root, ptr); + } + else + { + memset(ptr, 0, sizeof(memcached_server_st)); } } @@ -73,37 +88,30 @@ void memcached_server_free(memcached_server_st *ptr) */ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr) { - memcached_server_st *new_clone; + memcached_server_st *rv= NULL; /* We just do a normal create if ptr is missing */ if (ptr == NULL) return NULL; - if (clone && clone->is_allocated == MEMCACHED_USED) + rv = memcached_server_create_with(ptr->root, clone, + ptr->hostname, ptr->port, ptr->weight, + ptr->type); + if (rv != NULL) { - WATCHPOINT_ASSERT(0); - return NULL; + rv->cached_errno= ptr->cached_errno; + if (ptr->cached_server_error) + rv->cached_server_error= strdup(ptr->cached_server_error); } - - new_clone= memcached_server_create(ptr->root, clone); - - if (new_clone == NULL) - return NULL; - new_clone->root= ptr->root; + return rv; - /* TODO We should check return type */ - memcached_server_create_with(new_clone->root, new_clone, - ptr->hostname, ptr->port, ptr->weight, - ptr->type); - - return new_clone; } -memcached_return memcached_server_cursor(memcached_st *ptr, - memcached_server_function *callback, - void *context, - unsigned int number_of_callbacks) +memcached_return_t memcached_server_cursor(memcached_st *ptr, + memcached_server_fn *callback, + void *context, + uint32_t number_of_callbacks) { unsigned int y; @@ -125,15 +133,14 @@ memcached_return memcached_server_cursor(memcached_st *ptr, return MEMCACHED_SUCCESS; } -memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, size_t key_length, memcached_return *error) +memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, size_t key_length, memcached_return_t *error) { uint32_t server_key; - unlikely (key_length == 0) - { - *error= MEMCACHED_NO_KEY_PROVIDED; + *error= memcached_validate_key_length(key_length, + ptr->flags.binary_protocol); + unlikely (*error != MEMCACHED_SUCCESS) return NULL; - } unlikely (ptr->number_of_hosts == 0) { @@ -141,7 +148,7 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key return NULL; } - if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) + if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) { *error= MEMCACHED_BAD_KEY_PROVIDED; return NULL; @@ -152,3 +159,21 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key return memcached_server_clone(NULL, &ptr->hosts[server_key]); } + +const char *memcached_server_error(memcached_server_st *ptr) +{ + if (ptr) + return ptr->cached_server_error; + else + return NULL; +} + +void memcached_server_error_reset(memcached_server_st *ptr) +{ + ptr->cached_server_error[0]= 0; +} + +memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr) +{ + return ptr->last_disconnected_server; +}