X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=1131de2baff3c4d47469ca4e5c2f5dd025f2c177;hb=d34fb751640d8d89dfdde229aeb7d508dc458d0c;hp=9df45603aaf76a962a4de19c30c803ac9ea64534;hpb=2c7a6aaf4a69aab11206078afcd3355271ddf128;p=m6w6%2Flibmemcached

diff --git a/include/memcached.h b/include/memcached.h
index 9df45603..1131de2b 100644
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -10,19 +10,9 @@
 #ifndef __MEMCACHED_H__
 #define __MEMCACHED_H__
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stdint.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" {
@@ -39,7 +29,7 @@ typedef struct memcached_server_st memcached_server_st;
 #define HUGE_STRING_LEN 8196
 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
 //#define MEMCACHED_MAX_BUFFER 8196
-#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN*4
+#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -76,6 +66,8 @@ typedef enum {
   MEMCACHED_BEHAVIOR_TCP_NODELAY,
   MEMCACHED_BEHAVIOR_MD5_HASHING,
   MEMCACHED_BEHAVIOR_KETAMA,
+  MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE,
+  MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE,
 } memcached_behavior;
 
 typedef enum {
@@ -140,6 +132,8 @@ struct memcached_st {
   char connected;
   int my_errno;
   unsigned long long flags;
+  int send_size;
+  int recv_size;
   memcached_return warning; /* Future Use */
 };
 
@@ -198,47 +192,48 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
 #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_increment(A,B) A->hosts[B].stack_responses++
-#define memcached_server_response_decrement(A,B) A->hosts[B].stack_responses--
 #define memcached_server_response_count(A,B) A->hosts[B].stack_responses
 
 memcached_return memcached_server_add(memcached_st *ptr, char *hostname, 
                                       unsigned int port);
+void memcached_server_list_free(memcached_server_st *ptr);
+memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list);
 
 memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, 
                                              char *hostname, unsigned int port, 
                                              memcached_return *error);
-void memcached_server_list_free(memcached_server_st *ptr);
-memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list);
 unsigned int memcached_server_list_count(memcached_server_st *ptr);
 memcached_server_st *memcached_servers_parse(char *server_strings);
 
-/* String Struct */
-#define memcached_string_length(A, B) (size_t)(B->end - B->string)
-#define memcached_string_size(A, B) B->current_size
-#define memcached_string_value(A, B) B->string
-
-memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size);
-memcached_return memcached_string_append_character(memcached_st *ptr, 
-                                                   memcached_string_st *string, 
-                                                   char character);
-memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
-                                         char *value, size_t length);
-size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove);
-memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string);
-void memcached_string_free(memcached_st *ptr, memcached_string_st *string);
-
 char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, 
                                char *key, memcached_return *error);
 char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
                                 memcached_return *error);
 
 /* Some personal debugging functions */
-#define WATCHPOINT printf("\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
-#define WATCHPOINT_ERROR(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);
-#define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, A);fflush(stdout);
-#define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d %d\n", __FILE__, __LINE__, A);fflush(stdout);
-#define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, strerror(A));A= 0;fflush(stdout);
+#ifdef HAVE_DEBUG
+#define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
+#define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);
+#define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout);
+#define WATCHPOINT_NUMBER(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout);
+#define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);
+#define WATCHPOINT_ASSERT(A) assert((A));
+#else
+/*
+#define WATCHPOINT { 1; };
+#define WATCHPOINT_ERROR(A) { 1; };
+#define WATCHPOINT_STRING(A) { 1; };
+#define WATCHPOINT_NUMBER(A) { 1; };
+#define WATCHPOINT_ERRNO(A) { 1; };
+#define WATCHPOINT_ASSERT(A) { 1; };
+*/
+#define WATCHPOINT
+#define WATCHPOINT_ERROR(A)
+#define WATCHPOINT_STRING(A)
+#define WATCHPOINT_NUMBER(A)
+#define WATCHPOINT_ERRNO(A)
+#define WATCHPOINT_ASSERT(A)
+#endif
 
 
 #ifdef __cplusplus