Fixed a typo that was causing a race condition error.

[m6w6/libmemcached] / libmemcached / memcached.h

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 5aca6db122074ed962cd7b53362f8c7d7489bd7a..a7cdc97722e289e079b79582e4e129cf93965fdf 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -60,27 +60,29 @@ struct memcached_st {
     @note these are static and should not change without a call to behavior.
   */
   struct {
-    bool is_purging MEMCACHED_BITFIELD;
-    bool is_processing_input MEMCACHED_BITFIELD;
+    bool is_purging:1;
+    bool is_processing_input:1;
+    bool is_time_for_rebuild:1;
   } state;
   struct {
     // Everything below here is pretty static.
-    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;
+    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; // Don't block
+    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 tcp_keepalive:1;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -94,6 +96,7 @@ struct memcached_st {
   uint32_t io_msg_watermark;
   uint32_t io_bytes_watermark;
   uint32_t io_key_prefetch;
+  uint32_t tcp_keepidle;
   int cached_errno;
   int32_t poll_timeout;
   int32_t connect_timeout;
@@ -122,20 +125,10 @@ struct memcached_st {
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
   memcached_callback_st *callbacks;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  struct {
-    const sasl_callback_t *callbacks;
-    /*
-    ** Did we allocate data inside the callbacks, or did the user
-    ** supply that.
-    */
-    bool is_allocated MEMCACHED_BITFIELD;
-  } sasl;
-
-#endif
+  struct memcached_sasl_st *sasl;
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_allocated:1;
   } options;
 
 };
@@ -153,6 +146,9 @@ memcached_st *memcached_create(memcached_st *ptr);
 LIBMEMCACHED_API
 void memcached_free(memcached_st *ptr);
 
+LIBMEMCACHED_API
+void memcached_reset_last_disconnected_server(memcached_st *ptr);
+
 LIBMEMCACHED_API
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);