Bugfix for memcached_connect() so that it will not always start up servers.

[awesomized/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index 6bf1e0be4efd5cd718939e83265306d14dc91484..48790ce8e28e4921b65015ffc1b94862a25e5655 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <netinet/in.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,6 +25,7 @@ typedef struct memcached_result_st memcached_result_st;
 typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_server_st memcached_server_st;
 
+#define MEMCACHED_VERSION_STRING 12
 #define MEMCACHED_DEFAULT_PORT 11211
 #define MEMCACHED_DEFAULT_COMMAND_SIZE 350
 #define SMALL_STRING_LEN 1024
@@ -34,7 +36,7 @@ typedef struct memcached_server_st memcached_server_st;
 typedef enum {
   MEMCACHED_SUCCESS,
   MEMCACHED_FAILURE,
-  MEMCACHED_HOST_LOCKUP_FAILURE,
+  MEMCACHED_HOST_LOOKUP_FAILURE,
   MEMCACHED_CONNECTION_FAILURE,
   MEMCACHED_CONNECTION_BIND_FAILURE,
   MEMCACHED_WRITE_FAILURE,
@@ -60,6 +62,7 @@ typedef enum {
   MEMCACHED_ERRNO,
   MEMCACHED_FAIL_UNIX_SOCKET,
   MEMCACHED_NOT_SUPPORTED,
+  MEMCACHED_NO_KEY_PROVIDED,
   MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
 } memcached_return;
 
@@ -70,6 +73,9 @@ typedef enum {
   MEMCACHED_BEHAVIOR_KETAMA,
   MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE,
   MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE,
+  MEMCACHED_BEHAVIOR_CACHE_LOOKUPS,
+  MEMCACHED_BEHAVIOR_SUPPORT_CAS,
+  MEMCACHED_BEHAVIOR_POLL_TIMEOUT,
 } memcached_behavior;
 
 typedef enum {
@@ -93,6 +99,7 @@ typedef enum {
 typedef enum {
   MEMCACHED_NOT_ALLOCATED,
   MEMCACHED_ALLOCATED,
+  MEMCACHED_USED,
 } memcached_allocated;
 
 struct memcached_server_st {
@@ -103,10 +110,16 @@ struct memcached_server_st {
   unsigned int cursor_active;
   char write_buffer[MEMCACHED_MAX_BUFFER];
   size_t write_buffer_offset;
+  char *write_ptr;
   char read_buffer[MEMCACHED_MAX_BUFFER];
   size_t read_buffer_length;
   char *read_ptr;
+  memcached_allocated sockaddr_inited;
+  struct sockaddr_in servAddr;
   memcached_connection type;
+  uint8_t major_version;
+  uint8_t minor_version;
+  uint8_t micro_version;
 };
 
 struct memcached_stat_st {
@@ -114,7 +127,7 @@ struct memcached_stat_st {
   unsigned int uptime;
   unsigned int threads;
   time_t time;
-  char version[8];
+  char version[MEMCACHED_VERSION_STRING];
   unsigned int pointer_size;
   unsigned int rusage_user;
   unsigned int rusage_system;
@@ -167,6 +180,7 @@ struct memcached_st {
   unsigned long long flags;
   int send_size;
   int recv_size;
+  int32_t poll_timeout;
   memcached_string_st result_buffer;
   memcached_hash hash;
   memcached_return warning; /* Future Use */
@@ -181,11 +195,11 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
                                   time_t expiration);
 memcached_return memcached_increment(memcached_st *ptr, 
                                      char *key, size_t key_length,
-                                     unsigned int offset,
+                                     uint32_t offset,
                                      uint64_t *value);
 memcached_return memcached_decrement(memcached_st *ptr, 
                                      char *key, size_t key_length,
-                                     unsigned int offset,
+                                     uint32_t offset,
                                      uint64_t *value);
 void memcached_stat_free(memcached_st *, memcached_stat_st *);
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
@@ -211,6 +225,22 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
                                    char *value, size_t value_length, 
                                    time_t expiration,
                                    uint16_t  flags);
+memcached_return memcached_append(memcached_st *ptr, 
+                                  char *key, size_t key_length,
+                                  char *value, size_t value_length, 
+                                  time_t expiration,
+                                  uint16_t flags);
+memcached_return memcached_prepend(memcached_st *ptr, 
+                                   char *key, size_t key_length,
+                                   char *value, size_t value_length, 
+                                   time_t expiration,
+                                   uint16_t flags);
+memcached_return memcached_cas(memcached_st *ptr, 
+                               char *key, size_t key_length,
+                               char *value, size_t value_length, 
+                               time_t expiration,
+                               uint16_t flags,
+                               uint64_t cas);
 
 /* Get functions */
 char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
@@ -228,12 +258,15 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
                                             memcached_return *error);
 
 /* Server Public functions */
-#define memcached_server_count(A) A->number_of_hosts
-#define memcached_server_name(A,B) B.hostname
-#define memcached_server_port(A,B) B.port
-#define memcached_server_list(A) A->hosts
-#define memcached_server_response_count(A,B) A->hosts[B].stack_responses
+#define memcached_server_count(A) (A)->number_of_hosts
+#define memcached_server_name(A,B) (B).hostname
+#define memcached_server_port(A,B) (B).port
+#define memcached_server_list(A) (A)->hosts
+#define memcached_server_response_count(A,B) (A)->hosts[B].stack_responses
 
+memcached_return memcached_server_add_udp(memcached_st *ptr, 
+                                          char *hostname,
+                                          unsigned int port);
 memcached_return memcached_server_add_unix_socket(memcached_st *ptr, 
                                                   char *filename);
 memcached_return memcached_server_add(memcached_st *ptr, char *hostname,