Merge in trunk.

[m6w6/libmemcached] / libtest / server_container.h

diff --git a/libtest/server_container.h b/libtest/server_container.h
index 9c9922ed0ed6b30c1a58b51e052826d7b6affaa9..4e81dafd27af310f22db1bf91ddd62160adebacb 100644 (file)
--- a/libtest/server_container.h
+++ b/libtest/server_container.h
@@ -38,6 +38,7 @@ private:
   std::string server_list;
   bool _socket;
   bool _sasl;
+  uint32_t _count;
   std::string _username;
   std::string _password;
 
@@ -49,18 +50,26 @@ public:
   server_startup_st() :
     _socket(false),
     _sasl(false),
+    _count(5),
     udp(0)
   { }
 
   bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]);
 
-  std::string option_string() const;
+  uint32_t count() const
+  {
+    return _count;
+  }
 
-  size_t count() const
+  void set_count(uint32_t arg)
   {
-    return servers.size();
+    _count= arg;
   }
 
+  void restart();
+
+  std::string option_string() const;
+
   const std::string& password() const
   {
     return _password;
@@ -99,7 +108,10 @@ public:
   }
 
 
-  void shutdown(bool remove= false);
+  void shutdown_and_remove();
+  void shutdown();
+  bool shutdown(uint32_t number_of_host);
+
   void push_server(Server *);
   Server *pop_server();