Small cleanups for design of some functions that will work with cluster.

[m6w6/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index a3ecf7e9c6fa109454aafe166dc98c5e01b1cc40..33abcc8137946087fd33b92f1f43a28f6a4b7f25 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -10,8 +10,19 @@
 #ifndef __MEMCACHED_H__
 #define __MEMCACHED_H__
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <limits.h>
+#include <assert.h>
 #include <time.h>
+#include <errno.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,9 +30,11 @@ extern "C" {
 
 typedef struct memcached_st memcached_st;
 typedef struct memcached_stat_st memcached_stat_st;
+typedef struct memcached_host_st memcached_host_st;
 
 #define MEMCACHED_DEFAULT_PORT 11211
 #define MEMCACHED_DEFAULT_COMMAND_SIZE 350
+#define HUGE_STRING_LEN 8196
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -49,14 +62,25 @@ typedef enum {
   MEMCACHED_ALLOCATED= 1,
 } memcached_allocated;
 
+struct memcached_host_st {
+  char *hostname;
+  unsigned int port;
+  int fd;
+  memcached_host_st *next;
+};
+
 struct memcached_stat_st {
   unsigned int pid;
   unsigned int uptime;
+  unsigned int threads;
   time_t time;
-  char *version;
-  unsigned rusage_user_seconds;
+  char version[8];
+  unsigned int pointer_size;
+  unsigned int rusage_user;
+  unsigned int rusage_system;
+  unsigned int rusage_user_seconds;
   unsigned int rusage_user_microseconds;
-  unsigned rusage_system_seconds;
+  unsigned int rusage_system_seconds;
   unsigned int rusage_system_microseconds;
   unsigned int curr_items;
   unsigned int total_items;
@@ -78,6 +102,7 @@ struct memcached_st {
   memcached_allocated is_allocated;
   int fd;
   char connected;
+  memcached_host_st *hosts;
 };
 
 /* Public API */
@@ -102,20 +127,25 @@ memcached_return memcached_increment(memcached_st *ptr, char *key, size_t key_le
                                      unsigned int count);
 memcached_return memcached_decrement(memcached_st *ptr, char *key, size_t key_length,
                                      unsigned int count);
-memcached_return memcached_stat(memcached_st *ptr, memcached_stat_st *stat);
+memcached_stat_st **memcached_stat(memcached_st *ptr, 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);
-char *memcached_version(memcached_st *ptr, memcached_return *error);
 memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
-memcached_return memcached_quit(memcached_st *ptr);
+memcached_return memcached_quit(memcached_st *ptr, char *hostname, unsigned port);
 char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
                     size_t *value_length, 
                     uint16_t *flags,
                     memcached_return *error);
-void memcached_server_add(memcached_st *ptr, char *server_name, unsigned int port);
-static memcached_return memcached_response(memcached_st *ptr, 
-                                           char *buffer, size_t buffer_length);
+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);
+
 #ifdef __cplusplus
 }
 #endif