X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=55713d45ced450d831bb71d971c98b6371156b02;hb=7ba11a92a63df071ee3f848c980c8459dc184ebc;hp=0fd1bbf366bbce0465d6e03cf37b95a0545e6809;hpb=ad5d3efae1a492151ab2b08d370d86d27931c3a9;p=awesomized%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index 0fd1bbf3..55713d45 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -20,6 +20,7 @@ */ +#include #include #include @@ -65,20 +66,25 @@ std::ostream& operator<<(std::ostream& output, const Server &arg) output << " Socket:" << arg.socket(); } - if (not arg.running().empty()) + if (arg.running().empty() == false) { output << " Exec:" << arg.running(); } - return output; // for multiple << operators } -Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : +#define MAGIC_MEMORY 123570 + +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), _pid(-1), _port(port_arg), - _hostname(host_arg) + _hostname(host_arg), + _app(executable, _is_libtool) { } @@ -88,6 +94,23 @@ Server::~Server() { Error << "Unable to kill:" << *this; } + + Application::error_t ret; + if (Application::SUCCESS != (ret= _app.wait())) + { + Error << "Application::wait() " << _running << " " << ret << ": " << _app.stderr_result(); + } +} + +bool Server::check() +{ + _app.slurp(); + return _app.check(); +} + +bool Server::validate() +{ + return _magic == MAGIC_MEMORY; } // If the server exists, kill it @@ -97,7 +120,8 @@ bool Server::cycle() // Try to ping, and kill the server #limit number of times pid_t current_pid; - while (--limit and is_pid_valid(current_pid= get_pid())) + while (--limit and + is_pid_valid(current_pid= get_pid())) { if (kill(current_pid)) { @@ -132,28 +156,35 @@ bool Server::start() Error << "Could not kill() existing server during start() pid:" << _pid; return false; } - assert(not has_pid()); - Application app(name(), is_libtool()); - if (args(app) == false) + if (has_pid() == false) { - Error << "Could not build command()"; - return false; + fatal_message("has_pid() failed, programer error"); + } + + // This needs more work. +#if 0 + if (gdb_is_caller()) + { + _app.use_gdb(); } +#endif - if (Application::SUCCESS != app.run()) + if (args(_app) == false) { - Error << "Application::run()"; + Error << "Could not build command()"; return false; } - if (Application::SUCCESS != app.wait()) + Application::error_t ret; + if (Application::SUCCESS != (ret= _app.run())) { - Error << "Application::wait()"; + Error << "Application::run() " << ret; return false; } + _running= _app.print(); - if (is_helgrind() or is_valgrind()) + if (valgrind_is_caller()) { dream(5, 50000); } @@ -162,18 +193,35 @@ bool Server::start() { Wait wait(pid_file(), 8); - if (not wait.successful()) + if (wait.successful() == false) { - Error << "Unable to open pidfile for: " << _running; + libtest::fatal(LIBYATL_DEFAULT_PARAM, + "Unable to open pidfile for: %s", + _running.c_str()); } } - int counter= 0; + uint32_t this_wait; bool pinged= false; - while ((pinged= ping()) == false and - counter < (is_helgrind() or is_valgrind() ? 20 : 5)) { - dream(counter++, 50000); + 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); + } } if (pinged == false) @@ -181,10 +229,18 @@ bool Server::start() // If we happen to have a pid file, lets try to kill it if (pid_file().empty() == false) { - Error << "We are going to kill it off"; - kill_file(pid_file()); + if (kill_file(pid_file()) == false) + { + fatal_message("Failed to kill off server after startup occurred, when pinging failed"); + } + Error << "Failed to ping(), waited:" << this_wait + << " server started, having pid_file. exec:" << _running + << " error:" << _app.stderr_result(); + } + else + { + Error << "Failed to ping() server started. exec:" << _running; } - Error << "Failed to ping() server started with:" << _running; _running.clear(); return false; } @@ -282,8 +338,7 @@ bool Server::set_log_file() int fd; if ((fd= mkstemp(file_buffer)) == -1) { - perror(file_buffer); - return false; + libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); } close(fd); @@ -296,13 +351,9 @@ bool Server::args(Application& app) { // Set a log file if it was requested (and we can) - if (getenv("LIBTEST_LOG") and has_log_file_option()) + if (has_log_file_option()) { - if (not set_log_file()) - { - return false; - } - + set_log_file(); log_file_option(app, _log_file); } @@ -321,15 +372,9 @@ bool Server::args(Application& app) pid_file_option(app, pid_file()); } - assert(daemon_file_option()); - if (daemon_file_option() and not is_valgrind() and not is_helgrind()) - { - app.add_option(daemon_file_option()); - } - - if (_is_socket and has_socket_file_option()) + if (has_socket_file_option()) { - if (not set_socket_file()) + if (set_socket_file() == false) { return false; } @@ -357,21 +402,6 @@ bool Server::args(Application& app) return true; } -bool Server::is_debug() const -{ - return bool(getenv("LIBTEST_MANUAL_GDB")); -} - -bool Server::is_valgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_VALGRIND")); -} - -bool Server::is_helgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_HELGRIND")); -} - bool Server::kill(pid_t pid_arg) { if (check_pid(pid_arg) and kill_pid(pid_arg)) // If we kill it, reset