Cleans up the assert and some other things that Fedora 15 found.

[m6w6/libmemcached] / libtest / server.h

diff --git a/libtest/server.h b/libtest/server.h
index 454f69ca81e1266824c6cd7d5d3e58a0f36380b2..c09469ecea160164f1076f62968e5a96b9bb1196 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -9,34 +9,200 @@
 
 #pragma once
 
+#include <cassert>
+#include <cstdio>
+#include <cstring>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <string>
 #include <unistd.h>
+#include <vector>
 
-/*
-  Server startup and shutdown functions.
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
+namespace libtest {
+
+struct Server {
+private:
+  bool _is_socket;
+  std::string _socket;
+  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:
+  in_port_t _port;
+  std::string _hostname;
+  std::string _extra_args;
+
+public:
+  Server(const std::string& hostname, const in_port_t port_arg, const bool is_socket_arg= false);
+
+  virtual ~Server();
+
+  virtual const char *name()= 0;
+  virtual const char *executable()= 0;
+  virtual const char *port_option()= 0;
+  virtual const char *pid_file_option()= 0;
+  virtual const char *daemon_file_option()= 0;
+  virtual const char *log_file_option()= 0;
+  virtual bool is_libtool()= 0;
+
+  virtual const char *socket_file_option() const
+  {
+    return NULL;
+  }
+
+  virtual bool broken_pid_file()
+  {
+    return false;
+  }
+
+  const std::string& pid_file() const
+  {
+    return _pid_file;
+  }
+
+  const std::string& base_command() const
+  {
+    return _base_command;
+  }
+
+  const std::string& log_file() const
+  {
+    return _log_file;
+  }
+
+  const std::string& hostname() const
+  {
+    return _hostname;
+  }
+
+  const std::string& socket() const
+  {
+    return _socket;
+  }
+
+  bool has_socket() const
+  {
+    return _is_socket;
+  }
+
+  bool cycle();
+
+  virtual bool ping()= 0;
+
+  virtual pid_t get_pid(bool error_is_ok= false)= 0;
+
+  virtual bool build(int argc, const char *argv[])= 0;
+
+  in_port_t port() const
+  {
+    return _port;
+  }
+
+  bool has_port() const
+  {
+    return (_port != 0);
+  }
+
+  // Reset a server if another process has killed the server
+  void reset()
+  {
+    _pid= -1;
+    _pid_file.clear();
+    _log_file.clear();
+  }
+
+  void set_extra_args(const std::string &arg);
 
-#include <libmemcached/memcached.h>
+  bool args(std::string& options);
 
-typedef struct server_startup_st server_startup_st;
-#define SERVERS_TO_CREATE 5
+  pid_t pid();
 
-struct server_startup_st
+  pid_t pid() const
+  {
+    return _pid;
+  }
+
+  bool has_pid() const
+  {
+    return (_pid > 1);
+  }
+
+  bool check_pid(pid_t pid_arg) const
+  {
+    return (pid_arg > 1);
+  }
+
+  bool is_socket() const
+  {
+    return _hostname[0] == '/';
+  }
+
+  const std::string running() const
+  {
+    return _running;
+  }
+
+  std::string log_and_pid();
+
+  bool kill(pid_t pid_arg);
+  bool start();
+  bool command(std::string& command_arg);
+
+protected:
+  void nap();
+
+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();
+};
+
+std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
+
+class server_startup_st
 {
-  uint8_t count;
+private:
+  std::string server_list;
+
+public:
+
   uint8_t udp;
-  memcached_server_st *servers;
-  char *server_list;
-  char pid_file[SERVERS_TO_CREATE][FILENAME_MAX];
-  in_port_t port[SERVERS_TO_CREATE];
-  int pids[SERVERS_TO_CREATE];
+  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_helgrind() const;
+  bool is_valgrind() const;
+
+  void shutdown(bool remove= false);
+  void push_server(Server *);
+  Server *pop_server();
+
+  ~server_startup_st();
 };
 
-void server_startup(server_startup_st *construct);
-void server_shutdown(server_startup_st *construct);
+bool server_startup(server_startup_st&, const std::string&, in_port_t try_port, int argc, const char *argv[]);
+
+} // namespace libtest
+
 
-#ifdef __cplusplus
-}
-#endif