Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-192

[awesomized/libmemcached] / libmemcached / instance.hpp

diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp
index fba02b2f4da0f2be1afb39fe5fe5b1f70b8cbb69..8f66e96d044b27e467226df0bc1f078e27444377 100644 (file)
--- a/libmemcached/instance.hpp
+++ b/libmemcached/instance.hpp
@@ -85,17 +85,42 @@ struct Instance {
   {
   }
 
+  bool valid() const;
+
+  bool is_shutting_down() const;
+
+  void start_close_socket();
+  void close_socket();
+
   uint32_t response_count() const
   {
     return cursor_active_;
   }
 
   struct {
-    bool is_allocated:1;
-    bool is_initialized:1;
-    bool is_shutting_down:1;
-    bool is_dead:1;
+    bool is_allocated;
+    bool is_initialized;
+    bool is_shutting_down;
+    bool is_dead;
+    bool ready;
   } options;
+
+  short _events;
+  short _revents;
+
+  short events(void)
+  {
+    return _events;
+  }
+
+  short revents(void)
+  {
+    return _revents;
+  }
+
+  void events(short);
+  void revents(short);
+
   uint32_t cursor_active_;
   in_port_t port_;
   memcached_socket_t fd;