X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=55713d45ced450d831bb71d971c98b6371156b02;hb=7ba11a92a63df071ee3f848c980c8459dc184ebc;hp=8b8b8f3e98776eef0a11a8fd18cd35280a9fbdcc;hpb=45bd4941b48480653534255cee795684ed230084;p=awesomized%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index 8b8b8f3e..55713d45 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -20,6 +20,7 @@ */ +#include #include #include @@ -42,19 +43,6 @@ static inline std::string &rtrim(std::string &s) #include #include -extern "C" { - static bool exited_successfully(int status) - { - if (WEXITSTATUS(status) == 0) - { - return true; - } - - return true; - } -} - - namespace libtest { std::ostream& operator<<(std::ostream& output, const Server &arg) @@ -78,30 +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 } -void Server::nap(void) -{ -#ifdef WIN32 - sleep(1); -#else - struct timespec global_sleep_value= { 0, 50000 }; - nanosleep(&global_sleep_value, NULL); -#endif -} +#define MAGIC_MEMORY 123570 -Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : +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) { } @@ -111,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 @@ -120,12 +120,13 @@ 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)) { Log << "Killed existing server," << *this << " with pid:" << current_pid; - nap(); + dream(0, 50000); continue; } } @@ -140,21 +141,6 @@ bool Server::cycle() return true; } -// Grab a one off command -bool Server::command(std::string& command_arg) -{ - rebuild_base_command(); - - command_arg+= _base_command; - - if (args(command_arg)) - { - return true; - } - - return false; -} - bool Server::wait_for_pidfile() const { Wait wait(pid_file(), 4); @@ -165,62 +151,96 @@ bool Server::wait_for_pidfile() const bool Server::start() { // If we find that we already have a pid then kill it. - if (has_pid() and not kill(_pid)) + if (has_pid() and kill(_pid) == false) { Error << "Could not kill() existing server during start() pid:" << _pid; return false; } - assert(not has_pid()); - _running.clear(); - if (not command(_running)) + if (has_pid() == false) { - Error << "Could not build command()"; - return false; + fatal_message("has_pid() failed, programer error"); } - if (is_valgrind() or is_helgrind()) + // This needs more work. +#if 0 + if (gdb_is_caller()) { - _running+= " &"; + _app.use_gdb(); } +#endif - int ret= system(_running.c_str()); - if (not exited_successfully(ret)) + if (args(_app) == false) { - Error << "system() failed:" << strerror(errno); - _running.clear(); + Error << "Could not build command()"; return false; } - if (is_helgrind() or is_valgrind()) + Application::error_t ret; + if (Application::SUCCESS != (ret= _app.run())) { - sleep(4); + Error << "Application::run() " << ret; + return false; } + _running= _app.print(); - if (pid_file_option() and not pid_file().empty()) + if (valgrind_is_caller()) + { + dream(5, 50000); + } + + if (pid_file().empty() == false) { 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 count= is_helgrind() or is_valgrind() ? 20 : 5; - while (not ping() and --count) + uint32_t this_wait; + bool pinged= false; { - nap(); + 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 (count == 0) + if (pinged == false) { // If we happen to have a pid file, lets try to kill it - if (pid_file_option() and not pid_file().empty()) + if (pid_file().empty() == false) { - 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; } @@ -243,6 +263,16 @@ pid_t Server::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::set_socket_file() { char file_buffer[FILENAME_MAX]; @@ -308,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); @@ -318,116 +347,66 @@ bool Server::set_log_file() return true; } -void Server::rebuild_base_command() +bool Server::args(Application& app) { - _base_command.clear(); - if (is_libtool()) - { - _base_command+= libtool(); - } - if (is_debug() and getenv("GDB_COMMAND")) - { - _base_command+= getenv("GDB_COMMAND"); - _base_command+= " "; - } - else if (is_valgrind() and getenv("VALGRIND_COMMAND")) - { - _base_command+= getenv("VALGRIND_COMMAND"); - _base_command+= " "; - } - else if (is_helgrind() and getenv("HELGRIND_COMMAND")) + // Set a log file if it was requested (and we can) + if (has_log_file_option()) { - _base_command+= getenv("HELGRIND_COMMAND"); - _base_command+= " "; + set_log_file(); + log_file_option(app, _log_file); } - _base_command+= executable(); -} - -void Server::set_extra_args(const std::string &arg) -{ - _extra_args= arg; -} - -bool Server::args(std::string& options) -{ - std::stringstream arg_buffer; - - // Set a log file if it was requested (and we can) - if (getenv("LIBTEST_LOG") and log_file_option()) + if (getenv("LIBTEST_SYSLOG") and has_syslog()) { - if (not set_log_file()) - { - return false; - } - - arg_buffer << " " << log_file_option() << _log_file; + app.add_option("--syslog"); } // Update pid_file - if (pid_file_option()) { - if (_pid_file.empty() and not set_pid_file()) + if (_pid_file.empty() and set_pid_file() == false) { return false; } - arg_buffer << " " << pid_file_option() << pid_file(); + pid_file_option(app, pid_file()); } - assert(daemon_file_option()); - if (daemon_file_option() and not is_valgrind() and not is_helgrind()) + if (has_socket_file_option()) { - arg_buffer << " " << daemon_file_option(); - } - - if (_is_socket and socket_file_option()) - { - if (not set_socket_file()) + if (set_socket_file() == false) { return false; } - arg_buffer << " " << socket_file_option() << "\"" << _socket << "\""; + socket_file_option(app, _socket); } - assert(port_option()); - if (port_option() and _port > 0) + if (has_port_option()) { - arg_buffer << " " << port_option() << _port; + port_option(app, _port); } - options+= arg_buffer.str(); - - if (not _extra_args.empty()) + for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++) { - options+= _extra_args; + if ((*iter).second.empty() == false) + { + app.add_option((*iter).first, (*iter).second); + } + else + { + app.add_option((*iter).first); + } } 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 { - if (broken_pid_file() and not pid_file().empty()) + if (broken_pid_file() and pid_file().empty() == false) { unlink(pid_file().c_str()); }