allocators.h   allocators.h 
skipping to change at line 40 skipping to change at line 40
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
struct memcached_allocator_t {
memcached_calloc_fn calloc;
memcached_free_fn free;
memcached_malloc_fn malloc;
memcached_realloc_fn realloc;
void *context;
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_set_memory_allocators(memcached_st *ptr, memcached_return_t memcached_set_memory_allocators(memcached_st *ptr,
memcached_malloc_fn mem_ malloc, memcached_malloc_fn mem_ malloc,
memcached_free_fn mem_fr ee, memcached_free_fn mem_fr ee,
memcached_realloc_fn mem _realloc, memcached_realloc_fn mem _realloc,
memcached_calloc_fn mem_ calloc, memcached_calloc_fn mem_ calloc,
skipping to change at line 70 skipping to change at line 62
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_get_memory_allocators(const memcached_st *ptr, void memcached_get_memory_allocators(const memcached_st *ptr,
memcached_malloc_fn *mem_malloc, memcached_malloc_fn *mem_malloc,
memcached_free_fn *mem_free, memcached_free_fn *mem_free,
memcached_realloc_fn *mem_realloc, memcached_realloc_fn *mem_realloc,
memcached_calloc_fn *mem_calloc); memcached_calloc_fn *mem_calloc);
LIBMEMCACHED_API LIBMEMCACHED_API
void *memcached_get_memory_allocators_context(const memcached_st *ptr); void *memcached_get_memory_allocators_context(const memcached_st *ptr);
LIBMEMCACHED_LOCAL
void _libmemcached_free(const memcached_st *ptr, void *mem, void *context);
LIBMEMCACHED_LOCAL
void *_libmemcached_malloc(const memcached_st *ptr, const size_t size, void
*context);
LIBMEMCACHED_LOCAL
void *_libmemcached_realloc(const memcached_st *ptr, void *mem, const size_
t size, void *context);
LIBMEMCACHED_LOCAL
void *_libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t si
ze, void *context);
LIBMEMCACHED_LOCAL
struct memcached_allocator_t memcached_allocators_return_default(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 2 change blocks. 
26 lines changed or deleted 0 lines changed or added


 analyze.h   analyze.h 
skipping to change at line 38 skipping to change at line 38
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #include <libmemcached-1.0/struct/analysis.h>
struct memcached_analysis_st { #pragma once
memcached_st *root;
uint32_t average_item_size;
uint32_t longest_uptime;
uint32_t least_free_server;
uint32_t most_consumed_server;
uint32_t oldest_server;
double pool_hit_ratio;
uint64_t most_used_bytes;
uint64_t least_remaining_bytes;
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_analysis_st *memcached_analyze(memcached_st *memc,
memcached_stat_st *memc_stat, memcached_stat_st *memc_stat,
memcached_return_t *error); memcached_return_t *error);
 End of changes. 2 change blocks. 
12 lines changed or deleted 2 lines changed or added


 callback.h   callback.h 
skipping to change at line 40 skipping to change at line 40
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
struct memcached_callback_st {
memcached_execute_fn *callback;
void *context;
uint32_t number_of_callback;
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_callback_set(memcached_st *ptr, memcached_return_t memcached_callback_set(memcached_st *ptr,
const memcached_callback_t flag, const memcached_callback_t flag,
const void *data); const void *data);
LIBMEMCACHED_API LIBMEMCACHED_API
void *memcached_callback_get(memcached_st *ptr, void *memcached_callback_get(memcached_st *ptr,
 End of changes. 1 change blocks. 
6 lines changed or deleted 0 lines changed or added


 hash.h   hash.h 
skipping to change at line 57 skipping to change at line 57
LIBMEMCACHED_API LIBMEMCACHED_API
const hashkit_st *memcached_get_hashkit(const memcached_st *ptr); const hashkit_st *memcached_get_hashkit(const memcached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_set_hashkit(memcached_st *ptr, hashkit_st *has hk); memcached_return_t memcached_set_hashkit(memcached_st *ptr, hashkit_st *has hk);
LIBMEMCACHED_API LIBMEMCACHED_API
uint32_t memcached_generate_hash(const memcached_st *ptr, const char *key, size_t key_length); uint32_t memcached_generate_hash(const memcached_st *ptr, const char *key, size_t key_length);
LIBMEMCACHED_LOCAL
uint32_t memcached_generate_hash_with_redistribution(memcached_st *ptr, con
st char *key, size_t key_length);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_autoeject(memcached_st *ptr); void memcached_autoeject(memcached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
const char * libmemcached_string_hash(memcached_hash_t type); const char * libmemcached_string_hash(memcached_hash_t type);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
4 lines changed or deleted 0 lines changed or added


 platform.h   platform.h 
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
* *
* Libmemcached library * Libmemcached library
* *
* Copyright (C) 2011 Data Differential, http://datadifferential.com/ * Copyright (C) 2011 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker, Trond Norbye All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
* met: * met:
* *
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* * Redistributions in binary form must reproduce the above * * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer * copyright notice, this list of conditions and the following disclaimer
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 quit.h   quit.h 
skipping to change at line 47 skipping to change at line 47
#pragma once #pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_quit(memcached_st *ptr); void memcached_quit(memcached_st *ptr);
LIBMEMCACHED_LOCAL
void memcached_quit_server(memcached_server_st *ptr, bool io_death);
LIBMEMCACHED_LOCAL
void send_quit(memcached_st *ptr);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
6 lines changed or deleted 0 lines changed or added


 result.h   result.h 
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
* *
* Libmemcached library * Libmemcached library
* *
* Copyright (C) 2011 Data Differential, http://datadifferential.com/ * Copyright (C) 2011 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
* met: * met:
* *
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* * Redistributions in binary form must reproduce the above * * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer * copyright notice, this list of conditions and the following disclaimer
skipping to change at line 38 skipping to change at line 38
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #include <libmemcached-1.0/struct/result.h>
struct memcached_result_st { #pragma once
uint32_t item_flags;
time_t item_expiration;
size_t key_length;
uint64_t item_cas;
memcached_st *root;
memcached_string_st value;
uint64_t count;
char item_key[MEMCACHED_MAX_KEY];
struct {
bool is_allocated:1;
bool is_initialized:1;
} options;
/* Add result callback function */
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Result Struct */ /* Result Struct */
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_result_free(memcached_result_st *result); void memcached_result_free(memcached_result_st *result);
LIBMEMCACHED_API LIBMEMCACHED_API
 End of changes. 3 change blocks. 
17 lines changed or deleted 3 lines changed or added


 return.h   return.h 
skipping to change at line 39 skipping to change at line 39
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
enum memcached_return_t {
MEMCACHED_SUCCESS,
MEMCACHED_FAILURE,
MEMCACHED_HOST_LOOKUP_FAILURE, // getaddrinfo() and getnameinfo() only
MEMCACHED_CONNECTION_FAILURE,
MEMCACHED_CONNECTION_BIND_FAILURE, // DEPRECATED, see MEMCACHED_HOST_LOO
KUP_FAILURE
MEMCACHED_WRITE_FAILURE,
MEMCACHED_READ_FAILURE,
MEMCACHED_UNKNOWN_READ_FAILURE,
MEMCACHED_PROTOCOL_ERROR,
MEMCACHED_CLIENT_ERROR,
MEMCACHED_SERVER_ERROR,
MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED
MEMCACHED_DATA_EXISTS,
MEMCACHED_DATA_DOES_NOT_EXIST,
MEMCACHED_NOTSTORED,
MEMCACHED_STORED,
MEMCACHED_NOTFOUND,
MEMCACHED_MEMORY_ALLOCATION_FAILURE,
MEMCACHED_PARTIAL_READ,
MEMCACHED_SOME_ERRORS,
MEMCACHED_NO_SERVERS,
MEMCACHED_END,
MEMCACHED_DELETED,
MEMCACHED_VALUE,
MEMCACHED_STAT,
MEMCACHED_ITEM,
MEMCACHED_ERRNO,
MEMCACHED_FAIL_UNIX_SOCKET, // DEPRECATED
MEMCACHED_NOT_SUPPORTED,
MEMCACHED_NO_KEY_PROVIDED, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED!
*/
MEMCACHED_FETCH_NOTFINISHED,
MEMCACHED_TIMEOUT,
MEMCACHED_BUFFERED,
MEMCACHED_BAD_KEY_PROVIDED,
MEMCACHED_INVALID_HOST_PROTOCOL,
MEMCACHED_SERVER_MARKED_DEAD,
MEMCACHED_UNKNOWN_STAT_KEY,
MEMCACHED_E2BIG,
MEMCACHED_INVALID_ARGUMENTS,
MEMCACHED_KEY_TOO_BIG,
MEMCACHED_AUTH_PROBLEM,
MEMCACHED_AUTH_FAILURE,
MEMCACHED_AUTH_CONTINUE,
MEMCACHED_PARSE_ERROR,
MEMCACHED_PARSE_USER_ERROR,
MEMCACHED_DEPRECATED,
MEMCACHED_IN_PROGRESS,
MEMCACHED_SERVER_TEMPORARILY_DISABLED,
MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
};
#ifndef __cplusplus
typedef enum memcached_return_t memcached_return_t;
#endif
static inline bool memcached_success(memcached_return_t rc) static inline bool memcached_success(memcached_return_t rc)
{ {
return (rc == MEMCACHED_BUFFERED || return (rc == MEMCACHED_BUFFERED ||
rc == MEMCACHED_DELETED || rc == MEMCACHED_DELETED ||
rc == MEMCACHED_END || rc == MEMCACHED_END ||
rc == MEMCACHED_ITEM || rc == MEMCACHED_ITEM ||
rc == MEMCACHED_STAT || rc == MEMCACHED_STAT ||
rc == MEMCACHED_STORED || rc == MEMCACHED_STORED ||
rc == MEMCACHED_SUCCESS || rc == MEMCACHED_SUCCESS ||
rc == MEMCACHED_VALUE); rc == MEMCACHED_VALUE);
 End of changes. 1 change blocks. 
58 lines changed or deleted 0 lines changed or added


 sasl.h   sasl.h 
skipping to change at line 65 skipping to change at line 65
memcached_return_t memcached_set_sasl_auth_data(memcached_st *ptr, memcached_return_t memcached_set_sasl_auth_data(memcached_st *ptr,
const char *username, const char *username,
const char *password); const char *password);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_destroy_sasl_auth_data(memcached_st *ptr); memcached_return_t memcached_destroy_sasl_auth_data(memcached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr); sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_clone_sasl(memcached_st *clone, const memcach
ed_st *source);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_sasl_authenticate_connection(memcached_server_
st *server);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
struct memcached_sasl_st { #include <libmemcached-1.0/struct/sasl.h>
sasl_callback_t *callbacks;
/*
** Did we allocate data inside the callbacks, or did the user
** supply that.
*/
bool is_allocated;
};
 End of changes. 2 change blocks. 
8 lines changed or deleted 0 lines changed or added


 server.h   server.h 
skipping to change at line 40 skipping to change at line 40
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
#ifndef WIN32 #include <libmemcached-1.0/struct/server.h>
#include <netdb.h>
#endif
#ifdef NI_MAXHOST
#define MEMCACHED_NI_MAXHOST NI_MAXHOST
#else
#define MEMCACHED_NI_MAXHOST 1025
#endif
enum memcached_server_state_t {
MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done
MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathere
d
MEMCACHED_SERVER_STATE_IN_PROGRESS,
MEMCACHED_SERVER_STATE_CONNECTED,
MEMCACHED_SERVER_STATE_IN_TIMEOUT
};
struct memcached_server_st {
struct {
bool is_allocated:1;
bool is_initialized:1;
bool is_shutting_down:1;
bool is_dead:1;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
memcached_socket_t fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter;
uint64_t server_failure_counter_query_id;
uint32_t weight;
uint32_t version;
enum memcached_server_state_t state;
struct {
uint32_t read;
uint32_t write;
} io_wait_count;
uint8_t major_version; // Default definition of UINT8_MAX means that it h
as not been set.
uint8_t micro_version; // ditto
uint8_t minor_version; // ditto
memcached_connection_t type;
char *read_ptr;
size_t read_buffer_length;
size_t read_data_length;
size_t write_buffer_offset;
struct addrinfo *address_info;
struct addrinfo *address_info_next;
time_t next_retry;
memcached_st *root;
uint64_t limit_maxbytes;
struct memcached_error_t *error_messages;
char read_buffer[MEMCACHED_MAX_BUFFER];
char write_buffer[MEMCACHED_MAX_BUFFER];
char hostname[MEMCACHED_NI_MAXHOST];
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_cursor(const memcached_st *ptr, memcached_return_t memcached_server_cursor(const memcached_st *ptr,
const memcached_server_fn *callb ack, const memcached_server_fn *callb ack,
void *context, void *context,
uint32_t number_of_callbacks); uint32_t number_of_callbacks);
skipping to change at line 120 skipping to change at line 64
const char *key, const char *key,
size_t key_length, size_t key_length,
memcached_return_t * error); memcached_return_t * error);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_server_error_reset(memcached_server_st *ptr); void memcached_server_error_reset(memcached_server_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_server_free(memcached_server_st *ptr); void memcached_server_free(memcached_server_st *ptr);
LIBMEMCACHED_LOCAL
memcached_server_st *memcached_server_clone(memcached_server_st *destinatio
n,
memcached_server_st *source);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_instance_st memcached_server_get_last_disconnect(const mem cached_st *ptr); memcached_server_instance_st memcached_server_get_last_disconnect(const mem cached_st *ptr);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_udp(memcached_st *ptr, memcached_return_t memcached_server_add_udp(memcached_st *ptr,
const char *hostname, const char *hostname,
in_port_t port); in_port_t port);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr,
const char *filename); const char *filename);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add(memcached_st *ptr, memcached_return_t memcached_server_add(memcached_st *ptr,
const char *hostname, in_port_t por t); const char *hostname, in_port_t por t);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_server_add_parsed(memcached_st *ptr,
const char *hostname,
size_t hostname_length,
in_port_t port,
uint32_t weight);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr, memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr,
const char *hostnam e, const char *hostnam e,
in_port_t port, in_port_t port,
uint32_t weight); uint32_t weight);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_s t *ptr, memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_s t *ptr,
const char *filename, const char *filename,
uint32_t we ight); uint32_t we ight);
LIBMEMCACHED_API LIBMEMCACHED_API
skipping to change at line 174 skipping to change at line 107
LIBMEMCACHED_API LIBMEMCACHED_API
const char *memcached_server_name(const memcached_server_instance_st self); const char *memcached_server_name(const memcached_server_instance_st self);
LIBMEMCACHED_API LIBMEMCACHED_API
in_port_t memcached_server_port(const memcached_server_instance_st self); in_port_t memcached_server_port(const memcached_server_instance_st self);
LIBMEMCACHED_API LIBMEMCACHED_API
const char *memcached_server_type(const memcached_server_instance_st ptr); const char *memcached_server_type(const memcached_server_instance_st ptr);
LIBMEMCACHED_LOCAL
void __server_free(memcached_server_st *);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
 End of changes. 4 change blocks. 
74 lines changed or deleted 1 lines changed or added


 server_list.h   server_list.h 
skipping to change at line 65 skipping to change at line 65
memcached_return_t *error); memcached_return_t *error);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_server_list_st memcached_server_list_append_with_weight(memcach ed_server_list_st ptr, memcached_server_list_st memcached_server_list_append_with_weight(memcach ed_server_list_st ptr,
const c har *hostname, const c har *hostname,
in_port _t port, in_port _t port,
uint32_ t weight, uint32_ t weight,
memcach ed_return_t *error); memcach ed_return_t *error);
LIBMEMCACHED_API LIBMEMCACHED_API
uint32_t memcached_server_list_count(const memcached_server_list_st ptr); uint32_t memcached_server_list_count(const memcached_server_list_st ptr);
LIBMEMCACHED_LOCAL
uint32_t memcached_servers_set_count(memcached_server_list_st servers, ui
nt32_t count);
LIBMEMCACHED_LOCAL
memcached_server_st *memcached_server_list(const memcached_st *);
LIBMEMCACHED_LOCAL
void memcached_server_list_set(memcached_st *self, memcached_server_list_
st list);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
 End of changes. 1 change blocks. 
11 lines changed or deleted 0 lines changed or added


 stats.h   stats.h 
skipping to change at line 38 skipping to change at line 38
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #include <libmemcached-1.0/struct/stat.h>
struct memcached_stat_st { #pragma once
unsigned long connection_structures;
unsigned long curr_connections;
unsigned long curr_items;
pid_t pid;
unsigned long pointer_size;
unsigned long rusage_system_microseconds;
unsigned long rusage_system_seconds;
unsigned long rusage_user_microseconds;
unsigned long rusage_user_seconds;
unsigned long threads;
unsigned long time;
unsigned long total_connections;
unsigned long total_items;
unsigned long uptime;
unsigned long long bytes;
unsigned long long bytes_read;
unsigned long long bytes_written;
unsigned long long cmd_get;
unsigned long long cmd_set;
unsigned long long evictions;
unsigned long long get_hits;
unsigned long long get_misses;
unsigned long long limit_maxbytes;
char version[MEMCACHED_VERSION_STRING_LENGTH];
void *__future; // @todo create a new structure to place here for future
usage
memcached_st *root;
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
LIBMEMCACHED_API LIBMEMCACHED_API
void memcached_stat_free(const memcached_st *, memcached_stat_st *); void memcached_stat_free(const memcached_st *, memcached_stat_st *);
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_ return_t *error); memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_ return_t *error);
 End of changes. 2 change blocks. 
30 lines changed or deleted 2 lines changed or added


 string.h   string.h 
skipping to change at line 54 skipping to change at line 54
1) is_initialized is always valid. 1) is_initialized is always valid.
2) A string once intialized will always be, until free where we 2) A string once intialized will always be, until free where we
unset this flag. unset this flag.
3) A string always has a root. 3) A string always has a root.
*/ */
struct memcached_string_st { struct memcached_string_st {
char *end; char *end;
char *string; char *string;
size_t current_size; size_t current_size;
memcached_st *root; struct memcached_st *root;
struct { struct {
bool is_allocated:1; bool is_allocated:1;
bool is_initialized:1; bool is_initialized:1;
} options; } options;
}; };
#ifdef __cplusplus
extern "C" {
#endif
LIBMEMCACHED_LOCAL
memcached_string_st *memcached_string_create(memcached_st *ptr,
memcached_string_st *string,
size_t initial_size);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_string_check(memcached_string_st *string, size
_t need);
LIBMEMCACHED_LOCAL
char *memcached_string_c_copy(memcached_string_st *string);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_string_append_character(memcached_string_st *s
tring,
char character);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_string_append(memcached_string_st *string,
const char *value, size_t length
);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_string_reset(memcached_string_st *string);
LIBMEMCACHED_LOCAL
void memcached_string_free(memcached_string_st *string);
LIBMEMCACHED_LOCAL
size_t memcached_string_length(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
size_t memcached_string_size(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
const char *memcached_string_value(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
char *memcached_string_take_value(memcached_string_st *self);
LIBMEMCACHED_LOCAL
char *memcached_string_value_mutable(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
void memcached_string_set_length(memcached_string_st *self, size_t length);
#ifdef __cplusplus
}
#endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/