Rewrote return read() to now read exactly character by character.

[m6w6/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index 33abcc8137946087fd33b92f1f43a28f6a4b7f25..a9c64359f2ca83bc7bbaaa7d5e4db6f646420ffb 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -35,6 +35,9 @@ typedef struct memcached_host_st memcached_host_st;
 #define MEMCACHED_DEFAULT_PORT 11211
 #define MEMCACHED_DEFAULT_COMMAND_SIZE 350
 #define HUGE_STRING_LEN 8196
+#define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
+
+#define WATCHPOINT printf("WATCHPOINT %s:%d\n", __FILE__, __LINE__);fflush(stdout);
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -55,6 +58,7 @@ typedef enum {
   MEMCACHED_NOTFOUND,
   MEMCACHED_MEMORY_ALLOCATION_FAILURE,
   MEMCACHED_PARTIAL_READ,
+  MEMCACHED_SOME_ERRORS,
 } memcached_return;
 
 typedef enum {
@@ -66,7 +70,6 @@ struct memcached_host_st {
   char *hostname;
   unsigned int port;
   int fd;
-  memcached_host_st *next;
 };
 
 struct memcached_stat_st {
@@ -100,9 +103,10 @@ struct memcached_stat_st {
 
 struct memcached_st {
   memcached_allocated is_allocated;
-  int fd;
-  char connected;
   memcached_host_st *hosts;
+  unsigned int number_of_hosts;
+  unsigned int cursor_server;
+  char connected;
 };
 
 /* Public API */
@@ -123,28 +127,40 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
                                    uint16_t  flags);
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration);
-memcached_return memcached_increment(memcached_st *ptr, char *key, size_t key_length,
-                                     unsigned int count);
-memcached_return memcached_decrement(memcached_st *ptr, char *key, size_t key_length,
-                                     unsigned int count);
-memcached_stat_st **memcached_stat(memcached_st *ptr, memcached_return *error);
+memcached_return memcached_increment(memcached_st *ptr, 
+                                     char *key, size_t key_length,
+                                     unsigned int offset,
+                                     unsigned int *value);
+memcached_return memcached_decrement(memcached_st *ptr, 
+                                     char *key, size_t key_length,
+                                     unsigned int offset,
+                                     unsigned int *value);
+memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
 memcached_return memcached_stat_hostname(memcached_stat_st *stat, char *args, 
                                          char *hostname, unsigned int port);
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
 memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
-memcached_return memcached_quit(memcached_st *ptr, char *hostname, unsigned port);
+void memcached_quit(memcached_st *ptr);
 char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
                     size_t *value_length, 
                     uint16_t *flags,
                     memcached_return *error);
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port);
+memcached_return memcached_mget(memcached_st *ptr, 
+                                char **keys, size_t *key_length, 
+                                unsigned int number_of_keys);
+char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, 
+                      size_t *value_length, uint16_t *flags, 
+                      memcached_return *error);
+memcached_return memcached_server_add(memcached_st *ptr, char *hostname, 
+                                      unsigned int port);
 char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 
 /* These are all private, do not use. */
 memcached_return memcached_connect(memcached_st *ptr);
 memcached_return memcached_response(memcached_st *ptr, 
-                                    char *buffer, 
-                                    size_t buffer_length);
+                                    char *buffer, size_t buffer_length,
+                                    unsigned int server_key);
+unsigned int memcached_generate_hash(char *key, size_t key_length);
 
 #ifdef __cplusplus
 }