X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.h;h=b91f55b13de3124b4102961efadffcba053ac3b4;hb=7fa8de4e2ea94be425cccafd829aa24ce83ec9aa;hp=f13cad0781c302f12aca53fdab500b8136d189c4;hpb=28602fd2f5f1c758b50cd82d4545da8e6c55f5c7;p=m6w6%2Flibmemcached

diff --git a/libtest/server.h b/libtest/server.h
index f13cad07..b91f55b1 100644
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -1,10 +1,22 @@
-/*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- * Copyright (C) 2006-2009 Brian Aker
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  libtest
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #pragma once
@@ -24,13 +36,14 @@ struct Server {
 private:
   bool _is_socket;
   std::string _socket;
+  std::string _sasl;
   std::string _pid_file;
   std::string _log_file;
   std::string _base_command; // executable command which include libtool, valgrind, gdb, etc
   std::string _running; // Current string being used for system()
+  pid_t _pid;
 
 protected:
-  pid_t _pid;
   in_port_t _port;
   std::string _hostname;
   std::string _extra_args;
@@ -48,6 +61,11 @@ public:
   virtual const char *log_file_option()= 0;
   virtual bool is_libtool()= 0;
 
+  virtual bool broken_socket_cleanup()
+  {
+    return false;
+  }
+
   virtual const char *socket_file_option() const
   {
     return NULL;
@@ -92,7 +110,7 @@ public:
 
   virtual bool ping()= 0;
 
-  virtual pid_t get_pid(bool error_is_ok= true)= 0;
+  virtual pid_t get_pid(bool error_is_ok= false)= 0;
 
   virtual bool build(int argc, const char *argv[])= 0;
 
@@ -130,6 +148,13 @@ public:
     return (_pid > 1);
   }
 
+  bool wait_for_pidfile() const;
+
+  bool check_pid(pid_t pid_arg) const
+  {
+    return (pid_arg > 1);
+  }
+
   bool is_socket() const
   {
     return _hostname[0] == '/';
@@ -142,18 +167,19 @@ public:
 
   std::string log_and_pid();
 
-  bool kill();
+  bool kill(pid_t pid_arg);
   bool start();
   bool command(std::string& command_arg);
 
 protected:
   void nap();
+  bool set_pid_file();
 
 private:
+  bool is_helgrind() const;
   bool is_valgrind() const;
   bool is_debug() const;
   bool set_log_file();
-  bool set_pid_file();
   bool set_socket_file();
   void rebuild_base_command();
   void reset_pid();
@@ -161,41 +187,6 @@ private:
 
 std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
 
-class server_startup_st
-{
-private:
-  std::string server_list;
-
-public:
-
-  uint8_t udp;
-  std::vector<Server *> servers;
-
-  server_startup_st() :
-    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;
-
-  size_t count() const
-  {
-    return servers.size();
-  }
-
-  bool is_debug() const;
-  bool is_valgrind() const;
-
-  void shutdown(bool remove= false);
-  void push_server(Server *);
-  Server *pop_server();
-
-  ~server_startup_st();
-};
-
-bool server_startup(server_startup_st&, const std::string&, in_port_t try_port, int argc, const char *argv[]);
-
 } // namespace libtest