libmemcached_config.h   libmemcached_config.h 
/* libmemcached/libmemcached_config.h. Generated from libmemcached_config. h.in by configure. */ /* libmemcached/libmemcached_config.h. Generated from libmemcached_config. h.in by configure. */
/* libmemcached/libmemcached_config.h.in. Generated from configure.ac by a utoheader. */ /* libmemcached/libmemcached_config.h.in. Generated from configure.ac by a utoheader. */
/* Enable big endian byteorder */
/* #undef BYTEORDER_BIG_ENDIAN */
/* Enables DEBUG Support */ /* Enables DEBUG Support */
/* #undef HAVE_DEBUG */ /* #undef HAVE_DEBUG */
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* Enables DTRACE Support */ /* Enables DTRACE Support */
/* #undef HAVE_DTRACE */ /* #undef HAVE_DTRACE */
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 memcached.h   memcached.h 
skipping to change at line 40 skipping to change at line 40
/* These are Private and should not be used by applications */ /* These are Private and should not be used by applications */
#define MEMCACHED_VERSION_STRING_LENGTH 12 #define MEMCACHED_VERSION_STRING_LENGTH 12
/* string value */ /* string value */
struct memcached_continuum_item_st { struct memcached_continuum_item_st {
uint32_t index; uint32_t index;
uint32_t value; uint32_t value;
}; };
#define LIBMEMCACHED_VERSION_STRING "0.22" #define LIBMEMCACHED_VERSION_STRING "0.23"
struct memcached_stat_st { struct memcached_stat_st {
uint32_t pid; uint32_t pid;
uint32_t uptime; uint32_t uptime;
uint32_t threads; uint32_t threads;
uint32_t time; uint32_t time;
uint32_t pointer_size; uint32_t pointer_size;
uint32_t rusage_user_seconds; uint32_t rusage_user_seconds;
uint32_t rusage_user_microseconds; uint32_t rusage_user_microseconds;
uint32_t rusage_system_seconds; uint32_t rusage_system_seconds;
skipping to change at line 72 skipping to change at line 72
uint64_t get_misses; uint64_t get_misses;
uint64_t evictions; uint64_t evictions;
uint64_t bytes_read; uint64_t bytes_read;
uint64_t bytes_written; uint64_t bytes_written;
char version[MEMCACHED_VERSION_STRING_LENGTH]; char version[MEMCACHED_VERSION_STRING_LENGTH];
}; };
struct memcached_st { struct memcached_st {
memcached_allocated is_allocated; memcached_allocated is_allocated;
memcached_server_st *hosts; memcached_server_st *hosts;
unsigned int number_of_hosts; uint32_t number_of_hosts;
unsigned int cursor_server; uint32_t cursor_server;
int cached_errno; int cached_errno;
uint32_t flags; uint32_t flags;
int send_size; int send_size;
int recv_size; int recv_size;
int32_t poll_timeout; int32_t poll_timeout;
int32_t connect_timeout; int32_t connect_timeout;
int32_t retry_timeout; int32_t retry_timeout;
memcached_result_st result; memcached_result_st result;
memcached_hash hash; memcached_hash hash;
memcached_server_distribution distribution; memcached_server_distribution distribution;
void *user_data; void *user_data;
unsigned int *wheel;
uint32_t wheel_count;
uint32_t continuum_count; uint32_t continuum_count;
memcached_continuum_item_st *continuum; memcached_continuum_item_st *continuum;
memcached_clone_func on_clone; memcached_clone_func on_clone;
memcached_cleanup_func on_cleanup; memcached_cleanup_func on_cleanup;
memcached_free_function call_free; memcached_free_function call_free;
memcached_malloc_function call_malloc; memcached_malloc_function call_malloc;
memcached_realloc_function call_realloc; memcached_realloc_function call_realloc;
memcached_trigger_key get_key_failure; memcached_trigger_key get_key_failure;
memcached_trigger_delete_key delete_trigger; memcached_trigger_delete_key delete_trigger;
char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
size_t prefix_key_length; size_t prefix_key_length;
#ifdef NOT_USED /* Future Use */ memcached_hash hash_continuum;
uint8_t replicas; uint32_t continuum_points_counter;
memcached_return warning; int32_t snd_timeout;
#endif int32_t rcv_timeout;
uint32_t server_failure_limit;
}; };
/* Public API */ /* Public API */
const char * memcached_lib_version(void); const char * memcached_lib_version(void);
memcached_st *memcached_create(memcached_st *ptr); memcached_st *memcached_create(memcached_st *ptr);
void memcached_free(memcached_st *ptr); void memcached_free(memcached_st *ptr);
memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr); memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr);
memcached_return memcached_delete(memcached_st *ptr, const char *key, size_ t key_length, memcached_return memcached_delete(memcached_st *ptr, const char *key, size_ t key_length,
 End of changes. 4 change blocks. 
9 lines changed or deleted 8 lines changed or added


 memcached_constants.h   memcached_constants.h 
skipping to change at line 63 skipping to change at line 63
MEMCACHED_VALUE, MEMCACHED_VALUE,
MEMCACHED_STAT, MEMCACHED_STAT,
MEMCACHED_ERRNO, MEMCACHED_ERRNO,
MEMCACHED_FAIL_UNIX_SOCKET, MEMCACHED_FAIL_UNIX_SOCKET,
MEMCACHED_NOT_SUPPORTED, MEMCACHED_NOT_SUPPORTED,
MEMCACHED_NO_KEY_PROVIDED, MEMCACHED_NO_KEY_PROVIDED,
MEMCACHED_FETCH_NOTFINISHED, MEMCACHED_FETCH_NOTFINISHED,
MEMCACHED_TIMEOUT, MEMCACHED_TIMEOUT,
MEMCACHED_BUFFERED, MEMCACHED_BUFFERED,
MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_BAD_KEY_PROVIDED,
MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
} memcached_return; } memcached_return;
typedef enum { typedef enum {
MEMCACHED_DISTRIBUTION_MODULA, MEMCACHED_DISTRIBUTION_MODULA,
MEMCACHED_DISTRIBUTION_CONSISTENT, MEMCACHED_DISTRIBUTION_CONSISTENT,
MEMCACHED_DISTRIBUTION_CONSISTENT_WHEEL, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA
MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
} memcached_server_distribution; } memcached_server_distribution;
typedef enum { typedef enum {
MEMCACHED_BEHAVIOR_NO_BLOCK, MEMCACHED_BEHAVIOR_NO_BLOCK,
MEMCACHED_BEHAVIOR_TCP_NODELAY, MEMCACHED_BEHAVIOR_TCP_NODELAY,
MEMCACHED_BEHAVIOR_HASH, MEMCACHED_BEHAVIOR_HASH,
MEMCACHED_BEHAVIOR_KETAMA, MEMCACHED_BEHAVIOR_KETAMA,
MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE,
MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE,
MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS,
MEMCACHED_BEHAVIOR_SUPPORT_CAS, MEMCACHED_BEHAVIOR_SUPPORT_CAS,
MEMCACHED_BEHAVIOR_POLL_TIMEOUT, MEMCACHED_BEHAVIOR_POLL_TIMEOUT,
MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_BEHAVIOR_DISTRIBUTION,
MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
MEMCACHED_BEHAVIOR_USER_DATA, MEMCACHED_BEHAVIOR_USER_DATA,
MEMCACHED_BEHAVIOR_SORT_HOSTS, MEMCACHED_BEHAVIOR_SORT_HOSTS,
MEMCACHED_BEHAVIOR_VERIFY_KEY, MEMCACHED_BEHAVIOR_VERIFY_KEY,
MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED,
MEMCACHED_BEHAVIOR_KETAMA_HASH,
MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
MEMCACHED_BEHAVIOR_SND_TIMEOUT,
MEMCACHED_BEHAVIOR_RCV_TIMEOUT,
MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT
} memcached_behavior; } memcached_behavior;
typedef enum { typedef enum {
MEMCACHED_CALLBACK_PREFIX_KEY, MEMCACHED_CALLBACK_PREFIX_KEY,
MEMCACHED_CALLBACK_USER_DATA, MEMCACHED_CALLBACK_USER_DATA,
MEMCACHED_CALLBACK_CLEANUP_FUNCTION, MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
MEMCACHED_CALLBACK_CLONE_FUNCTION, MEMCACHED_CALLBACK_CLONE_FUNCTION,
MEMCACHED_CALLBACK_MALLOC_FUNCTION, MEMCACHED_CALLBACK_MALLOC_FUNCTION,
MEMCACHED_CALLBACK_REALLOC_FUNCTION, MEMCACHED_CALLBACK_REALLOC_FUNCTION,
MEMCACHED_CALLBACK_FREE_FUNCTION, MEMCACHED_CALLBACK_FREE_FUNCTION,
MEMCACHED_CALLBACK_GET_FAILURE, MEMCACHED_CALLBACK_GET_FAILURE,
MEMCACHED_CALLBACK_DELETE_TRIGGER, MEMCACHED_CALLBACK_DELETE_TRIGGER
} memcached_callback; } memcached_callback;
typedef enum { typedef enum {
MEMCACHED_HASH_DEFAULT= 0, MEMCACHED_HASH_DEFAULT= 0,
MEMCACHED_HASH_MD5, MEMCACHED_HASH_MD5,
MEMCACHED_HASH_CRC, MEMCACHED_HASH_CRC,
MEMCACHED_HASH_FNV1_64, MEMCACHED_HASH_FNV1_64,
MEMCACHED_HASH_FNV1A_64, MEMCACHED_HASH_FNV1A_64,
MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1_32,
MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_FNV1A_32,
MEMCACHED_HASH_HSIEH, MEMCACHED_HASH_HSIEH,
MEMCACHED_HASH_MURMUR, MEMCACHED_HASH_MURMUR
} memcached_hash; } memcached_hash;
typedef enum { typedef enum {
MEMCACHED_CONNECTION_UNKNOWN, MEMCACHED_CONNECTION_UNKNOWN,
MEMCACHED_CONNECTION_TCP, MEMCACHED_CONNECTION_TCP,
MEMCACHED_CONNECTION_UDP, MEMCACHED_CONNECTION_UDP,
MEMCACHED_CONNECTION_UNIX_SOCKET, MEMCACHED_CONNECTION_UNIX_SOCKET
} memcached_connection; } memcached_connection;
typedef enum { typedef enum {
MEMCACHED_NOT_ALLOCATED, MEMCACHED_NOT_ALLOCATED,
MEMCACHED_ALLOCATED, MEMCACHED_ALLOCATED,
MEMCACHED_USED, MEMCACHED_USED
} memcached_allocated; } memcached_allocated;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MEMCACHED_CONSTANTS_H__ */ #endif /* __MEMCACHED_CONSTANTS_H__ */
 End of changes. 7 change blocks. 
7 lines changed or deleted 12 lines changed or added


 memcached_result.h   memcached_result.h 
skipping to change at line 35 skipping to change at line 35
/* Add result callback function */ /* Add result callback function */
}; };
/* Result Struct */ /* Result Struct */
void memcached_result_free(memcached_result_st *result); void memcached_result_free(memcached_result_st *result);
void memcached_result_reset(memcached_result_st *ptr); void memcached_result_reset(memcached_result_st *ptr);
memcached_result_st *memcached_result_create(memcached_st *ptr, memcached_result_st *memcached_result_create(memcached_st *ptr,
memcached_result_st *result); memcached_result_st *result);
#define memcached_result_key_value(A) (A)->key #define memcached_result_key_value(A) (A)->key
#define memcached_result_key_length(A) (A)->key_length #define memcached_result_key_length(A) (A)->key_length
#define memcached_result_string_st(A) ((A)->value)
#ifdef FIX #ifdef FIX
#define memcached_result_value(A) memcached_string_value((A)->value) #define memcached_result_value(A) memcached_string_value((A)->value)
#define memcached_result_length(A) memcached_string_length((A)->value) #define memcached_result_length(A) memcached_string_length((A)->value)
#else #else
char *memcached_result_value(memcached_result_st *ptr); char *memcached_result_value(memcached_result_st *ptr);
size_t memcached_result_length(memcached_result_st *ptr); size_t memcached_result_length(memcached_result_st *ptr);
#endif #endif
#define memcached_result_flags(A) (A)->flags #define memcached_result_flags(A) (A)->flags
#define memcached_result_cas(A) (A)->cas #define memcached_result_cas(A) (A)->cas
memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length); memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 memcached_server.h   memcached_server.h 
skipping to change at line 37 skipping to change at line 37
char *read_ptr; char *read_ptr;
memcached_allocated sockaddr_inited; memcached_allocated sockaddr_inited;
struct addrinfo *address_info; struct addrinfo *address_info;
memcached_connection type; memcached_connection type;
uint8_t major_version; uint8_t major_version;
uint8_t minor_version; uint8_t minor_version;
uint8_t micro_version; uint8_t micro_version;
uint16_t count; uint16_t count;
time_t next_retry; time_t next_retry;
memcached_st *root; memcached_st *root;
uint64_t limit_maxbytes;
uint32_t server_failure_counter;
}; };
#define memcached_server_count(A) (A)->number_of_hosts #define memcached_server_count(A) (A)->number_of_hosts
#define memcached_server_name(A,B) (B).hostname #define memcached_server_name(A,B) (B).hostname
#define memcached_server_port(A,B) (B).port #define memcached_server_port(A,B) (B).port
#define memcached_server_list(A) (A)->hosts #define memcached_server_list(A) (A)->hosts
#define memcached_server_response_count(A) (A)->cursor_active #define memcached_server_response_count(A) (A)->cursor_active
#ifdef __cplusplus #ifdef __cplusplus
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/