memcached.h   memcached.h 
skipping to change at line 17 skipping to change at line 17
* *
* Summary: interface for memcached server * Summary: interface for memcached server
* Description: main include file for libmemcached * Description: main include file for libmemcached
* *
*/ */
#ifndef __LIBMEMCACHED_MEMCACHED_H__ #ifndef __LIBMEMCACHED_MEMCACHED_H__
#define __LIBMEMCACHED_MEMCACHED_H__ #define __LIBMEMCACHED_MEMCACHED_H__
#include <inttypes.h> #include <inttypes.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#if !defined(__cplusplus) #if !defined(__cplusplus)
# include <stdbool.h> # include <stdbool.h>
#endif #endif
#include <libmemcached/visibility.h> #include <libmemcached/visibility.h>
#include <libmemcached/configure.h> #include <libmemcached/configure.h>
#include <libmemcached/platform.h>
#include <libmemcached/constants.h> #include <libmemcached/constants.h>
#include <libmemcached/types.h> #include <libmemcached/types.h>
#include <libmemcached/string.h> #include <libmemcached/string.h>
#include <libmemcached/stats.h> #include <libmemcached/stats.h>
#include <libhashkit/hashkit.h> #include <libhashkit/hashkit.h>
// Everything above this line must be in the order specified. // Everything above this line must be in the order specified.
#include <libmemcached/allocators.h> #include <libmemcached/allocators.h>
#include <libmemcached/analyze.h> #include <libmemcached/analyze.h>
#include <libmemcached/auto.h> #include <libmemcached/auto.h>
#include <libmemcached/behavior.h> #include <libmemcached/behavior.h>
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 protocol_handler.h   protocol_handler.h 
skipping to change at line 22 skipping to change at line 22
*/ */
#ifndef __LIBMEMCACHED_PROTOCOL_H__ #ifndef __LIBMEMCACHED_PROTOCOL_H__
#define __LIBMEMCACHED_PROTOCOL_H__ #define __LIBMEMCACHED_PROTOCOL_H__
#include <sys/types.h> #include <sys/types.h>
#if !defined(__cplusplus) #if !defined(__cplusplus)
# include <stdbool.h> # include <stdbool.h>
#endif #endif
#include <libmemcached/platform.h>
#include <libmemcached/memcached/protocol_binary.h> #include <libmemcached/memcached/protocol_binary.h>
#include <libmemcached/visibility.h> #include <libmemcached/visibility.h>
#include <libmemcached/protocol/callback.h> #include <libmemcached/protocol/callback.h>
/* Forward declarations */ /* Forward declarations */
/* /*
* You should only access memcached_protocol_st from one thread!, * You should only access memcached_protocol_st from one thread!,
* and never assume anything about the internal layout / sizes of the * and never assume anything about the internal layout / sizes of the
* structures. * structures.
*/ */
skipping to change at line 51 skipping to change at line 52
* This function should behave exactly like read(2) * This function should behave exactly like read(2)
* *
* @param cookie a cookie used to represent a given client * @param cookie a cookie used to represent a given client
* @param fd the filedescriptor associated with the client * @param fd the filedescriptor associated with the client
* @param buf destination buffer * @param buf destination buffer
* @param nbuf number of bytes to receive * @param nbuf number of bytes to receive
* @return the number of bytes copied into buf * @return the number of bytes copied into buf
* or -1 upon error (errno should contain more information) * or -1 upon error (errno should contain more information)
*/ */
typedef ssize_t (*memcached_protocol_recv_func)(const void *cookie, typedef ssize_t (*memcached_protocol_recv_func)(const void *cookie,
int fd, memcached_socket_t fd,
void *buf, void *buf,
size_t nbuf); size_t nbuf);
/** /**
* Function the protocol handler should call to send data. * Function the protocol handler should call to send data.
* This function should behave exactly like write(2) * This function should behave exactly like write(2)
* *
* @param cookie a cookie used to represent a given client * @param cookie a cookie used to represent a given client
* @param fd the filedescriptor associated with the client * @param fd the filedescriptor associated with the client
* @param buf the source buffer * @param buf the source buffer
* @param nbuf number of bytes to send * @param nbuf number of bytes to send
* @return the number of bytes sent * @return the number of bytes sent
* or -1 upon error (errno should contain more information) * or -1 upon error (errno should contain more information)
*/ */
typedef ssize_t (*memcached_protocol_send_func)(const void *cookie, typedef ssize_t (*memcached_protocol_send_func)(const void *cookie,
int fd, memcached_socket_t fd,
const void *buf, const void *buf,
size_t nbuf); size_t nbuf);
/** /**
* Create an instance of the protocol handler * Create an instance of the protocol handler
* *
* @return NULL if allocation of an instance fails * @return NULL if allocation of an instance fails
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_protocol_st *memcached_protocol_create_instance(void); memcached_protocol_st *memcached_protocol_create_instance(void);
skipping to change at line 141 skipping to change at line 142
memcached_protocol_recv_func recv, memcached_protocol_recv_func recv,
memcached_protocol_send_func send); memcached_protocol_send_func send);
/** /**
* Create a new client instance and associate it with a socket * Create a new client instance and associate it with a socket
* @param instance the protocol instance to bind the client to * @param instance the protocol instance to bind the client to
* @param sock the client socket * @param sock the client socket
* @return NULL if allocation fails, otherwise an instance * @return NULL if allocation fails, otherwise an instance
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_protocol_client_st *memcached_protocol_create_client(memcached_pr otocol_st *instance, int sock); memcached_protocol_client_st *memcached_protocol_create_client(memcached_pr otocol_st *instance, memcached_socket_t sock);
/** /**
* Destroy a client handle. * Destroy a client handle.
* The caller needs to close the socket accociated with the client * The caller needs to close the socket accociated with the client
* <b>before</b> calling this function. This function invalidates the * <b>before</b> calling this function. This function invalidates the
* client memory area. * client memory area.
* *
* @param client the client to destroy * @param client the client to destroy
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
skipping to change at line 193 skipping to change at line 194
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
memcached_protocol_event_t memcached_protocol_client_work(memcached_protoco l_client_st *client); memcached_protocol_event_t memcached_protocol_client_work(memcached_protoco l_client_st *client);
/** /**
* Get the socket attached to a client handle * Get the socket attached to a client handle
* @param client the client to query * @param client the client to query
* @return the socket handle * @return the socket handle
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
int memcached_protocol_client_get_socket(memcached_protocol_client_st *clie nt); memcached_socket_t memcached_protocol_client_get_socket(memcached_protocol_ client_st *client);
/** /**
* Get the error id socket attached to a client handle * Get the error id socket attached to a client handle
* @param client the client to query for an error code * @param client the client to query for an error code
* @return the OS error code from the client * @return the OS error code from the client
*/ */
LIBMEMCACHED_API LIBMEMCACHED_API
int memcached_protocol_client_get_errno(memcached_protocol_client_st *clien t); int memcached_protocol_client_get_errno(memcached_protocol_client_st *clien t);
/** /**
 End of changes. 5 change blocks. 
4 lines changed or deleted 5 lines changed or added


 server.h   server.h 
skipping to change at line 26 skipping to change at line 26
struct { struct {
bool is_allocated:1; bool is_allocated:1;
bool is_initialized:1; bool is_initialized:1;
bool sockaddr_inited:1; bool sockaddr_inited:1;
bool is_shutting_down:1; bool is_shutting_down:1;
} options; } options;
uint32_t number_of_hosts; uint32_t number_of_hosts;
uint32_t cursor_active; uint32_t cursor_active;
in_port_t port; in_port_t port;
int cached_errno; int cached_errno;
int fd; memcached_socket_t fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */ uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter; uint32_t server_failure_counter;
uint32_t weight; uint32_t weight;
struct { // Place any "state" sort variables in here. struct { // Place any "state" sort variables in here.
bool is_corked:1; bool is_corked:1;
bool is_dead:1; bool is_dead:1;
} state; } state;
struct { struct {
uint32_t read; uint32_t read;
uint32_t write; uint32_t write;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 stats.h   stats.h 
skipping to change at line 65 skipping to change at line 65
const char *hostname, in_port_ t port); const char *hostname, in_port_ t port);
LIBMEMCACHED_API LIBMEMCACHED_API
char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st * memc_stat, char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st * memc_stat,
const char *key, memcached_return_t *error); const char *key, memcached_return_t *error);
LIBMEMCACHED_API LIBMEMCACHED_API
char ** memcached_stat_get_keys(const memcached_st *ptr, memcached_stat_st *memc_stat, char ** memcached_stat_get_keys(const memcached_st *ptr, memcached_stat_st *memc_stat,
memcached_return_t *error); memcached_return_t *error);
LIBMEMCACHED_API
memcached_return_t memcached_stat_execute(memcached_st *memc, const char *a
rgs, memcached_stat_fn func, void *context);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
#endif /* __LIBMEMCACHED_STATS_H__ */ #endif /* __LIBMEMCACHED_STATS_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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/