X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=78b729f96cb473faeeef973e325865cb0a28689f;hb=23bbe3972dada1e21493437ba64be129e86b59fc;hp=cb15aee94cbd2250636697681e7b78dc5a5ea577;hpb=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=m6w6%2Flibmemcached

diff --git a/libtest/server.cc b/libtest/server.cc
index cb15aee9..78b729f9 100644
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -35,15 +35,33 @@
  */
 
 #include <config.h>
-#include <iostream>
-#include <cstdlib>
+#include <libtest/common.h>
+
 #include <cassert>
+#include <cerrno>
+#include <climits>
+#include <cstdlib>
+#include <iostream>
+
+#include <algorithm> 
+#include <functional> 
+#include <locale>
+#include <unistd.h>
+
+// trim from end 
+static inline std::string &rtrim(std::string &s)
+{ 
+  s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end()); 
+  return s; 
+}
 
 #include <libtest/server.h>
+#include <libtest/stream.h>
 #include <libtest/killpid.h>
 
+namespace libtest {
 
-std::ostream& operator<<(std::ostream& output, const server_st &arg)
+std::ostream& operator<<(std::ostream& output, const Server &arg)
 {
   if (arg.is_socket())
   {
@@ -53,145 +71,401 @@ std::ostream& operator<<(std::ostream& output, const server_st &arg)
   {
     output << arg.hostname() << ":" << arg.port();
   }
+
+  if (arg.has_pid())
+  {
+    output << " Pid:" <<  arg.pid();
+  }
+
+  if (arg.has_socket())
+  {
+    output << " Socket:" <<  arg.socket();
+  }
+
+  if (arg.running().empty() == false)
+  {
+    output << " Exec:" <<  arg.running();
+  }
+
   return output;  // for multiple << operators
 }
 
-static void global_sleep(void)
-{
-  static struct timespec global_sleep_value= { 0, 50000 };
+#define MAGIC_MEMORY 123570
 
-#ifdef WIN32
-  sleep(1);
-#else
-  nanosleep(&global_sleep_value, NULL);
-#endif
+Server::Server(const std::string& host_arg, const in_port_t port_arg,
+               const std::string& executable, const bool _is_libtool,
+               bool is_socket_arg) :
+  _magic(MAGIC_MEMORY),
+  _is_socket(is_socket_arg),
+  _port(port_arg),
+  _hostname(host_arg),
+  _app(executable, _is_libtool)
+{
 }
 
-server_st::server_st(in_port_t port_arg, test_server_getpid *get_pid_arg, test_server_ping *ping_arg) :
-  _used(false),
-  _pid(-1),
-  _port(port_arg),
-  __get_pid(get_pid_arg),
-  __ping(ping_arg),
-  _hostname("localhost")
+Server::~Server()
 {
-  pid_file[0]= 0;
 }
 
-server_st::server_st(const std::string &socket_file, test_server_getpid *get_pid_arg, test_server_ping *ping_arg) :
-  _used(false),
-  _pid(-1),
-  _port(0),
-  __get_pid(get_pid_arg),
-  __ping(ping_arg),
-  _hostname(socket_file)
+bool Server::check()
 {
-  pid_file[0]= 0;
+  _app.slurp();
+  _app.check();
+  return true;
 }
 
+bool Server::validate()
+{
+  return _magic == MAGIC_MEMORY;
+}
 
-server_st::~server_st()
+// If the server exists, kill it
+bool Server::cycle()
 {
-  if (has_pid())
+  uint32_t limit= 3;
+
+  // Try to ping, and kill the server #limit number of times
+  while (--limit and 
+         is_pid_valid(_app.pid()))
+  {
+    if (kill())
+    {
+      Log << "Killed existing server," << *this;
+      dream(0, 50000);
+      continue;
+    }
+  }
+
+  // For whatever reason we could not kill it, and we reached limit
+  if (limit == 0)
   {
-    kill();
+    Error << "Reached limit, could not kill server";
+    return false;
   }
+
+  return true;
+}
+
+bool Server::wait_for_pidfile() const
+{
+  Wait wait(pid_file(), 4);
+
+  return wait.successful();
+}
+
+bool Server::has_pid() const
+{
+  return (_app.pid() > 1);
 }
 
-bool server_st::start()
+
+bool Server::start()
 {
-  assert(not _command.empty());
-  assert(not has_pid());
+  // If we find that we already have a pid then kill it.
+  if (has_pid() == true)
+  {
+#if 0
+    fatal_message("has_pid() failed, programer error");
+#endif
+  }
+
+  // This needs more work.
+#if 0
+  if (gdb_is_caller())
+  {
+    _app.use_gdb();
+  }
+#endif
+
+  if (getenv("YATL_PTRCHECK_SERVER"))
+  {
+    _app.use_ptrcheck();
+  }
+  else if (getenv("YATL_VALGRIND_SERVER"))
+  {
+    _app.use_valgrind();
+  }
 
-  if (has_pid())
+  if (args(_app) == false)
+  {
+    Error << "Could not build command()";
     return false;
+  }
 
-  if (system(_command.c_str()) == -1)
+  libtest::release_port(_port);
+  Application::error_t ret;
+  if (Application::SUCCESS !=  (ret= _app.run()))
+  {
+    Error << "Application::run() " << ret;
     return false;
+  }
+  _running= _app.print();
 
-  int count= 30;
-  while (not ping() and --count)
+  if (valgrind_is_caller())
   {
-    global_sleep();
+    dream(5, 50000);
   }
 
-  if (count == 0)
+  size_t repeat= 5;
+  _app.slurp();
+  while (--repeat)
   {
-    return false;
+    if (pid_file().empty() == false)
+    {
+      Wait wait(pid_file(), 8);
+
+      if (wait.successful() == false)
+      {
+        if (_app.check())
+        {
+          _app.slurp();
+          continue;
+        }
+
+        char buf[PATH_MAX];
+        char *getcwd_buf= getcwd(buf, sizeof(buf));
+        throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+                             "Unable to open pidfile in %s for: %s stderr:%s",
+                             getcwd_buf ? getcwd_buf : "",
+                             _running.c_str(),
+                             _app.stderr_c_str());
+      }
+    }
+  }
+
+  uint32_t this_wait= 0;
+  bool pinged= false;
+  {
+    uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow)
+    uint32_t waited;
+    uint32_t retry;
+
+    for (waited= 0, retry= 1; ; retry++, waited+= this_wait)
+    {
+      if ((pinged= ping()) == true)
+      {
+        break;
+      }
+      else if (waited >= timeout)
+      {
+        break;
+      }
+
+      this_wait= retry * retry / 3 + 1;
+      libtest::dream(this_wait, 0);
+    }
   }
 
-  _pid= get_pid();
+  if (pinged == false)
+  {
+    // If we happen to have a pid file, lets try to kill it
+    if ((pid_file().empty() == false) and (access(pid_file().c_str(), R_OK) == 0))
+    {
+      _app.slurp();
+      if (kill_file(pid_file()) == false)
+      {
+        throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+                             "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s",
+                             this_wait,
+                             int(_running.size()), _running.c_str(),
+                             int(_app.stderr_result_length()), _app.stderr_c_str());
+      }
+
+      throw libtest::fatal(LIBYATL_DEFAULT_PARAM, 
+                           "Failed native ping(), pid: %d is alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s",
+                           int(_app.pid()),
+                           _app.check() ? "true" : "false",
+                           this_wait,
+                           int(_running.size()), _running.c_str(),
+                           int(_app.stderr_result_length()), _app.stderr_c_str());
+    }
+    else
+    {
+      throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+                           "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s",
+                           int(_app.pid()),
+                           _app.check() ? "true" : "false",
+                           this_wait,
+                           int(_running.size()), _running.c_str(),
+                           int(_app.stderr_result_length()), _app.stderr_c_str());
+    }
+    _running.clear();
+    return false;
+  }
 
   return has_pid();
 }
 
-void server_st::reset_pid()
+void Server::reset_pid()
 {
-  pid_file[0]= 0;
-  _pid= -1;
+  _running.clear();
+  _pid_file.clear();
 }
 
-pid_t server_st::pid()
+pid_t Server::pid() const
 {
-  if (not has_pid())
-  {
-    _pid= get_pid();
-  }
+  return _app.pid();
+}
 
-  return _pid;
+void Server::add_option(const std::string& arg)
+{
+  _options.push_back(std::make_pair(arg, std::string()));
 }
 
+void Server::add_option(const std::string& name, const std::string& value)
+{
+  _options.push_back(std::make_pair(name, value));
+}
 
-bool server_st::kill()
+bool Server::set_socket_file()
 {
-  if (is_used())
-    return false;
+  char file_buffer[FILENAME_MAX];
+  file_buffer[0]= 0;
 
-  if ((_pid= get_pid()))
+  if (broken_pid_file())
   {
-    kill_pid(_pid);
-    if (pid_file[0])
-    {
-      unlink(pid_file); // If this happens we may be dealing with a dead server that left its pid file.
-    }
-    reset_pid();
+    snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.socketXXXXXX", name());
+  }
+  else
+  {
+    snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name());
+  }
 
-    return true;
+  int fd;
+  if ((fd= mkstemp(file_buffer)) == -1)
+  {
+    perror(file_buffer);
+    return false;
   }
-#if 0
-  else if (pid_file[0])
+  close(fd);
+  unlink(file_buffer);
+
+  _socket= file_buffer;
+
+  return true;
+}
+
+bool Server::set_pid_file()
+{
+  char file_buffer[FILENAME_MAX];
+  file_buffer[0]= 0;
+
+  if (broken_pid_file())
   {
-    kill_file(pid_file);
-    reset_pid();
+    snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.pidXXXXXX", name());
+  }
+  else
+  {
+    snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name());
+  }
 
-    return true;
+  int fd;
+  if ((fd= mkstemp(file_buffer)) == -1)
+  {
+    throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
   }
-#endif
+  close(fd);
+  unlink(file_buffer);
 
-  return false;
+  _pid_file= file_buffer;
+
+  return true;
 }
 
-void server_startup_st::push_server(server_st *arg)
+bool Server::set_log_file()
 {
-  servers.push_back(arg);
+  char file_buffer[FILENAME_MAX];
+  file_buffer[0]= 0;
+
+  snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name());
+  int fd;
+  if ((fd= mkstemp(file_buffer)) == -1)
+  {
+    throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
+  }
+  close(fd);
+
+  _log_file= file_buffer;
+
+  return true;
 }
 
-void server_startup_st::shutdown()
+bool Server::args(Application& app)
 {
-  for (std::vector<server_st *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+
+  // Set a log file if it was requested (and we can)
+  if (has_log_file_option())
   {
-    if ((*iter)->is_used())
-      continue;
+    set_log_file();
+    log_file_option(app, _log_file);
+  }
+
+  if (getenv("LIBTEST_SYSLOG") and has_syslog())
+  {
+    app.add_option("--syslog");
+  }
+
+  // Update pid_file
+  {
+    if (_pid_file.empty() and set_pid_file() == false)
+    {
+      return false;
+    }
 
-    (*iter)->kill();
+    pid_file_option(app, pid_file());
   }
+
+  if (has_socket_file_option())
+  {
+    if (set_socket_file() == false)
+    {
+      return false;
+    }
+
+    socket_file_option(app, _socket);
+  }
+
+  if (has_port_option())
+  {
+    port_option(app, _port);
+  }
+
+  for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++)
+  {
+    if ((*iter).second.empty() == false)
+    {
+      app.add_option((*iter).first, (*iter).second);
+    }
+    else
+    {
+      app.add_option((*iter).first);
+    }
+  }
+
+  return true;
 }
 
-server_startup_st::~server_startup_st()
+bool Server::kill()
 {
-  for (std::vector<server_st *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+  if (check_pid(_app.pid())) // If we kill it, reset
   {
-    delete *iter;
+    _app.murder();
+    if (broken_pid_file() and pid_file().empty() == false)
+    {
+      unlink(pid_file().c_str());
+    }
+
+    if (broken_socket_cleanup() and has_socket() and not socket().empty())
+    {
+      unlink(socket().c_str());
+    }
+
+    reset_pid();
+
+    return true;
   }
-  servers.clear();
+
+  return false;
 }
+
+} // namespace libtest