X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=30823a8733d3d96cc12cfc666c74d2c61af14ef4;hb=409b488619c121e786e8538d7fde5c9229c247ed;hp=5b92d6356d6ea2d3c31a38d8ed461e88bf6aba3e;hpb=284978b1dc258cb8cd2a32d6a0f25f2f9b284149;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 5b92d635..30823a87 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -13,16 +13,17 @@
 #ifndef __LIBMEMCACHED_MEMCACHED_H__
 #define __LIBMEMCACHED_MEMCACHED_H__
 
-#include <stdlib.h>
 #include <inttypes.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
 
 #if !defined(__cplusplus)
 # include <stdbool.h>
 #endif
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include <libmemcached/visibility.h>
 #include <libmemcached/configure.h>
 #include <libmemcached/constants.h>
@@ -47,64 +48,38 @@
 #include <libmemcached/quit.h>
 #include <libmemcached/result.h>
 #include <libmemcached/server.h>
+#include <libmemcached/server_list.h>
 #include <libmemcached/storage.h>
 #include <libmemcached/strerror.h>
 #include <libmemcached/verbosity.h>
 #include <libmemcached/version.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-LIBMEMCACHED_API
-void memcached_servers_reset(memcached_st *ptr);
-
-LIBMEMCACHED_API
-memcached_st *memcached_create(memcached_st *ptr);
-
-LIBMEMCACHED_API
-void memcached_free(memcached_st *ptr);
-
-LIBMEMCACHED_API
-memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);
-
-LIBMEMCACHED_API
-void *memcached_get_user_data(const memcached_st *ptr);
-
-LIBMEMCACHED_API
-void *memcached_set_user_data(memcached_st *ptr, void *data);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-
 struct memcached_st {
   /**
     @note these are static and should not change without a call to behavior.
   */
   struct {
-    bool is_purging:1;
-    bool is_processing_input:1;
+    bool is_purging MEMCACHED_BITFIELD;
+    bool is_processing_input MEMCACHED_BITFIELD;
   } state;
   struct {
     // Everything below here is pretty static.
-    bool auto_eject_hosts:1;
-    bool binary_protocol:1;
-    bool buffer_requests:1;
-    bool cork:1;
-    bool hash_with_prefix_key:1;
-    bool ketama_weighted:1;
-    bool no_block:1;
-    bool no_reply:1;
-    bool randomize_replica_read:1;
-    bool reuse_memory:1;
-    bool support_cas:1;
-    bool tcp_nodelay:1;
-    bool use_cache_lookups:1;
-    bool use_sort_hosts:1;
-    bool use_udp:1;
-    bool verify_key:1;
+    bool auto_eject_hosts MEMCACHED_BITFIELD;
+    bool binary_protocol MEMCACHED_BITFIELD;
+    bool buffer_requests MEMCACHED_BITFIELD;
+    bool cork MEMCACHED_BITFIELD;
+    bool hash_with_prefix_key MEMCACHED_BITFIELD;
+    bool ketama_weighted MEMCACHED_BITFIELD;
+    bool no_block MEMCACHED_BITFIELD;
+    bool no_reply MEMCACHED_BITFIELD;
+    bool randomize_replica_read MEMCACHED_BITFIELD;
+    bool reuse_memory MEMCACHED_BITFIELD;
+    bool support_cas MEMCACHED_BITFIELD;
+    bool tcp_nodelay MEMCACHED_BITFIELD;
+    bool use_cache_lookups MEMCACHED_BITFIELD;
+    bool use_sort_hosts MEMCACHED_BITFIELD;
+    bool use_udp MEMCACHED_BITFIELD;
+    bool verify_key MEMCACHED_BITFIELD;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -148,113 +123,75 @@ struct memcached_st {
   memcached_callback_st *callbacks;
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
-    bool is_allocated:1;
+    bool is_allocated MEMCACHED_BITFIELD;
   } options;
 
+};
+
 #ifdef __cplusplus
-  memcached_st() :
-    state(),
-    flags(),
-    distribution(),
-    hashkit(),
-    continuum_points_counter(),
-    number_of_hosts(),
-    servers(),
-    last_disconnected_server(),
-    snd_timeout(),
-    rcv_timeout(),
-    server_failure_limit(),
-    io_msg_watermark(),
-    io_bytes_watermark(),
-    io_key_prefetch(),
-    cached_errno(),
-    poll_timeout(),
-    connect_timeout(),
-    retry_timeout(),
-    continuum_count(),
-    send_size(),
-    recv_size(),
-    user_data(),
-    next_distribution_rebuild(),
-    prefix_key_length(),
-    number_of_replicas(),
-    distribution_hashkit(),
-    result(),
-    continuum(),
-    allocators(),
-    on_clone(),
-    on_cleanup(),
-    get_key_failure(),
-    delete_trigger(),
-    callbacks(),
-    prefix_key(),
-    options()
+extern "C" {
+#endif
+
+LIBMEMCACHED_API
+void memcached_servers_reset(memcached_st *ptr);
+
+LIBMEMCACHED_API
+memcached_st *memcached_create(memcached_st *ptr);
+
+LIBMEMCACHED_API
+void memcached_free(memcached_st *ptr);
+
+LIBMEMCACHED_API
+memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);
+
+LIBMEMCACHED_API
+void *memcached_get_user_data(const memcached_st *ptr);
+
+LIBMEMCACHED_API
+void *memcached_set_user_data(memcached_st *ptr, void *data);
+
+LIBMEMCACHED_API
+memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);
+
+LIBMEMCACHED_API
+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);
+
+LIBMEMCACHED_API
+uint32_t memcached_server_count(const memcached_st *);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+
+#ifdef __cplusplus
+class Memcached : private memcached_st {
+public:
+
+  Memcached()
   {
     memcached_create(this);
   }
 
-  ~memcached_st()
+  ~Memcached()
   {
     memcached_free(this);
   }
 
-  memcached_st(const memcached_st& source) :
-    state(),
-    flags(),
-    distribution(),
-    hashkit(),
-    continuum_points_counter(),
-    number_of_hosts(),
-    servers(),
-    last_disconnected_server(),
-    snd_timeout(),
-    rcv_timeout(),
-    server_failure_limit(),
-    io_msg_watermark(),
-    io_bytes_watermark(),
-    io_key_prefetch(),
-    cached_errno(),
-    poll_timeout(),
-    connect_timeout(),
-    retry_timeout(),
-    continuum_count(),
-    send_size(),
-    recv_size(),
-    user_data(),
-    next_distribution_rebuild(),
-    prefix_key_length(),
-    number_of_replicas(),
-    distribution_hashkit(),
-    result(),
-    continuum(),
-    allocators(),
-    on_clone(),
-    on_cleanup(),
-    get_key_failure(),
-    delete_trigger(),
-    callbacks(),
-    prefix_key(),
-    options()
-   {
-     memcached_clone(this, &source);
-   }
+  Memcached(const Memcached& source)
+  {
+    memcached_clone(this, &source);
+  }
 
-  memcached_st& operator=(const memcached_st& source)
-  { 
+  Memcached& operator=(const Memcached& source)
+  {
     memcached_free(this);
     memcached_clone(this, &source);
 
     return *this;
   }
-
-#endif
 };
-
-
-// Local Only Inline
-static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
-{
-  return &ptr->servers[server_key];
-}
+#endif
 
 #endif /* __LIBMEMCACHED_MEMCACHED_H__ */
+