| memcached.h | memcached.h | |||
|---|---|---|---|---|
| skipping to change at line 78 | skipping to change at line 78 | |||
| 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; | } memcached_behavior; | |||
| 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_KETAMA, | MEMCACHED_HASH_KETAMA, | |||
| MEMCACHED_HASH_HSIEH, | ||||
| } 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_allocated; | } memcached_allocated; | |||
| struct memcached_server_st { | struct memcached_server_st { | |||
| char *hostname; | char *hostname; | |||
| unsigned int port; | unsigned int port; | |||
| int fd; | int fd; | |||
| unsigned int stack_responses; | unsigned int stack_responses; | |||
| unsigned int cursor_active; | unsigned int cursor_active; | |||
| char write_buffer[MEMCACHED_MAX_BUFFER]; | char write_buffer[MEMCACHED_MAX_BUFFER]; | |||
| size_t write_buffer_offset; | size_t write_buffer_offset; | |||
| char *write_ptr; | char *write_ptr; | |||
| char read_buffer[MEMCACHED_MAX_BUFFER]; | char read_buffer[MEMCACHED_MAX_BUFFER]; | |||
| size_t read_buffer_length; | size_t read_buffer_length; | |||
| char *read_ptr; | char *read_ptr; | |||
| memcached_allocated sockaddr_inited; | memcached_allocated sockaddr_inited; | |||
| struct sockaddr_in servAddr; | struct sockaddr_in servAddr; | |||
| 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; | ||||
| }; | }; | |||
| struct memcached_stat_st { | struct memcached_stat_st { | |||
| unsigned int pid; | uint32_t pid; | |||
| unsigned int uptime; | uint32_t uptime; | |||
| unsigned int threads; | uint32_t threads; | |||
| time_t time; | uint32_t time; | |||
| uint32_t pointer_size; | ||||
| uint32_t rusage_user_seconds; | ||||
| uint32_t rusage_user_microseconds; | ||||
| uint32_t rusage_system_seconds; | ||||
| uint32_t rusage_system_microseconds; | ||||
| uint32_t curr_items; | ||||
| uint32_t total_items; | ||||
| uint32_t limit_maxbytes; | ||||
| uint32_t curr_connections; | ||||
| uint32_t total_connections; | ||||
| uint32_t connection_structures; | ||||
| uint64_t bytes; | ||||
| uint64_t cmd_get; | ||||
| uint64_t cmd_set; | ||||
| uint64_t get_hits; | ||||
| uint64_t get_misses; | ||||
| uint64_t evictions; | ||||
| uint64_t bytes_read; | ||||
| uint64_t bytes_written; | ||||
| char version[MEMCACHED_VERSION_STRING]; | char version[MEMCACHED_VERSION_STRING]; | |||
| unsigned int pointer_size; | ||||
| unsigned int rusage_user; | ||||
| unsigned int rusage_system; | ||||
| unsigned int rusage_user_seconds; | ||||
| unsigned int rusage_user_microseconds; | ||||
| unsigned int rusage_system_seconds; | ||||
| unsigned int rusage_system_microseconds; | ||||
| unsigned int curr_items; | ||||
| unsigned int total_items; | ||||
| unsigned long long bytes; | ||||
| unsigned int curr_connections; | ||||
| unsigned int total_connections; | ||||
| unsigned int connection_structures; | ||||
| unsigned long long cmd_get; | ||||
| unsigned long long cmd_set; | ||||
| unsigned long long get_hits; | ||||
| unsigned long long get_misses; | ||||
| unsigned long long evictions; | ||||
| unsigned long long bytes_read; | ||||
| unsigned long long bytes_written; | ||||
| unsigned int limit_maxbytes; | ||||
| }; | }; | |||
| struct memcached_string_st { | struct memcached_string_st { | |||
| memcached_st *root; | memcached_st *root; | |||
| memcached_allocated is_allocated; | memcached_allocated is_allocated; | |||
| char *string; | char *string; | |||
| char *end; | char *end; | |||
| size_t current_size; | size_t current_size; | |||
| size_t block_size; | size_t block_size; | |||
| }; | }; | |||
| skipping to change at line 181 | skipping to change at line 183 | |||
| 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; | unsigned int number_of_hosts; | |||
| unsigned int cursor_server; | unsigned int cursor_server; | |||
| char connected; | char connected; | |||
| int cached_errno; | int cached_errno; | |||
| unsigned long long flags; | unsigned long long flags; | |||
| int send_size; | int send_size; | |||
| int recv_size; | int recv_size; | |||
| int32_t poll_timeout; | ||||
| memcached_string_st result_buffer; | memcached_string_st result_buffer; | |||
| memcached_hash hash; | memcached_hash hash; | |||
| memcached_return warning; /* Future Use */ | memcached_return warning; /* Future Use */ | |||
| }; | }; | |||
| /* Public API */ | /* Public API */ | |||
| 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); | |||
| skipping to change at line 258 | skipping to change at line 261 | |||
| char **keys, size_t *key_length, | char **keys, size_t *key_length, | |||
| unsigned int number_of_keys); | unsigned int number_of_keys); | |||
| char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, | char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, | |||
| size_t *value_length, uint16_t *flags, | size_t *value_length, uint16_t *flags, | |||
| memcached_return *error); | memcached_return *error); | |||
| memcached_result_st *memcached_fetch_result(memcached_st *ptr, | memcached_result_st *memcached_fetch_result(memcached_st *ptr, | |||
| memcached_result_st *result, | memcached_result_st *result, | |||
| memcached_return *error); | memcached_return *error); | |||
| /* Server Public functions */ | /* Server Public functions */ | |||
| #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,B) A->hosts[B].stack_responses | #define memcached_server_response_count(A,B) (A)->hosts[B].stack_responses | |||
| memcached_return memcached_server_add_udp(memcached_st *ptr, | memcached_return memcached_server_add_udp(memcached_st *ptr, | |||
| char *hostname, | char *hostname, | |||
| unsigned int port); | unsigned int port); | |||
| memcached_return memcached_server_add_unix_socket(memcached_st *ptr, | memcached_return memcached_server_add_unix_socket(memcached_st *ptr, | |||
| char *filename); | char *filename); | |||
| memcached_return memcached_server_add(memcached_st *ptr, char *hostname, | memcached_return memcached_server_add(memcached_st *ptr, char *hostname, | |||
| unsigned int port); | unsigned int port); | |||
| void memcached_server_list_free(memcached_server_st *ptr); | void memcached_server_list_free(memcached_server_st *ptr); | |||
| memcached_return memcached_server_push(memcached_st *ptr, memcached_server_ st *list); | memcached_return memcached_server_push(memcached_st *ptr, memcached_server_ st *list); | |||
| End of changes. 8 change blocks. | ||||
| 30 lines changed or deleted | 33 lines changed or added | |||