X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=8b8b8f3e98776eef0a11a8fd18cd35280a9fbdcc;hb=45bd4941b48480653534255cee795684ed230084;hp=b8fb603e13696fdadc9bdcfa6cb97a6f719bbf6d;hpb=9a004d258a19fc2ddc13d2d2c6b70d2b6e2ff54f;p=awesomized%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index b8fb603e..8b8b8f3e 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -42,15 +42,6 @@ static inline std::string &rtrim(std::string &s) #include #include -#ifdef HAVE_LIBGEARMAN -#include -#include -#endif - -#ifdef HAVE_LIBMEMCACHED -#include -#endif - extern "C" { static bool exited_successfully(int status) { @@ -122,13 +113,6 @@ Server::~Server() } } -std::string server_startup_st::option_string() const -{ - std::string temp= server_list; - rtrim(temp); - return temp; -} - // If the server exists, kill it bool Server::cycle() { @@ -136,7 +120,7 @@ bool Server::cycle() // Try to ping, and kill the server #limit number of times pid_t current_pid; - while (--limit and (current_pid= get_pid()) != -1) + while (--limit and is_pid_valid(current_pid= get_pid())) { if (kill(current_pid)) { @@ -171,6 +155,13 @@ bool Server::command(std::string& command_arg) return false; } +bool Server::wait_for_pidfile() const +{ + Wait wait(pid_file(), 4); + + return wait.successful(); +} + bool Server::start() { // If we find that we already have a pid then kill it. @@ -201,22 +192,22 @@ bool Server::start() return false; } - if (is_helgrind()) + if (is_helgrind() or is_valgrind()) { sleep(4); } if (pid_file_option() and not pid_file().empty()) { - Wait wait(pid_file()); + Wait wait(pid_file(), 8); if (not wait.successful()) { - Error << "Unable to open pidfile: " << pid_file(); + Error << "Unable to open pidfile for: " << _running; } } - int count= is_helgrind() ? 20 : 5; + int count= is_helgrind() or is_valgrind() ? 20 : 5; while (not ping() and --count) { nap(); @@ -224,7 +215,12 @@ bool Server::start() if (count == 0) { - Error << "Failed to ping() server once started:" << *this; + // If we happen to have a pid file, lets try to kill it + if (pid_file_option() and not pid_file().empty()) + { + kill_file(pid_file()); + } + Error << "Failed to ping() server started with:" << _running; _running.clear(); return false; } @@ -258,7 +254,7 @@ bool Server::set_socket_file() } else { - snprintf(file_buffer, sizeof(file_buffer), "tests/var/run/%s.socketXXXXXX", name()); + snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name()); } int fd; @@ -286,7 +282,7 @@ bool Server::set_pid_file() } else { - snprintf(file_buffer, sizeof(file_buffer), "tests/var/run/%s.pidXXXXXX", name()); + snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name()); } int fd; @@ -308,7 +304,7 @@ bool Server::set_log_file() char file_buffer[FILENAME_MAX]; file_buffer[0]= 0; - snprintf(file_buffer, sizeof(file_buffer), "tests/var/log/%s.logXXXXXX", name()); + snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name()); int fd; if ((fd= mkstemp(file_buffer)) == -1) { @@ -325,10 +321,9 @@ bool Server::set_log_file() void Server::rebuild_base_command() { _base_command.clear(); - if (is_libtool() and getenv("LIBTOOL_COMMAND")) + if (is_libtool()) { - _base_command+= getenv("LIBTOOL_COMMAND"); - _base_command+= " "; + _base_command+= libtool(); } if (is_debug() and getenv("GDB_COMMAND")) @@ -373,7 +368,7 @@ bool Server::args(std::string& options) // Update pid_file if (pid_file_option()) { - if (not set_pid_file()) + if (_pid_file.empty() and not set_pid_file()) { return false; } @@ -437,280 +432,17 @@ bool Server::kill(pid_t pid_arg) unlink(pid_file().c_str()); } - reset_pid(); - - return true; - } - - return false; -} - -void server_startup_st::push_server(Server *arg) -{ - servers.push_back(arg); - - char port_str[NI_MAXSERV]; - snprintf(port_str, sizeof(port_str), "%u", int(arg->port())); - - std::string server_config_string; - if (arg->has_socket()) - { - server_config_string+= "--socket="; - server_config_string+= '"'; - server_config_string+= arg->socket(); - server_config_string+= '"'; - server_config_string+= " "; - } - else - { - server_config_string+= "--server="; - server_config_string+= arg->hostname(); - server_config_string+= ":"; - server_config_string+= port_str; - server_config_string+= " "; - } - - server_list+= server_config_string; - -} - -Server* server_startup_st::pop_server() -{ - Server *tmp= servers.back(); - servers.pop_back(); - return tmp; -} - -void server_startup_st::shutdown(bool remove) -{ - if (remove) - { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) - { - delete *iter; - } - servers.clear(); - } - else - { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) - { - if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid())) - { - Error << "Unable to kill:" << *(*iter); - } - } - } -} - -server_startup_st::~server_startup_st() -{ - shutdown(true); -} - -bool server_startup_st::is_debug() const -{ - return bool(getenv("LIBTEST_MANUAL_GDB")); -} - -bool server_startup_st::is_valgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_VALGRIND")); -} - -bool server_startup_st::is_helgrind() const -{ - return bool(getenv("LIBTEST_MANUAL_HELGRIND")); -} - - -bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[]) -{ - Outn(); - (void)try_port; - - // Look to see if we are being provided ports to use - { - char variable_buffer[1024]; - snprintf(variable_buffer, sizeof(variable_buffer), "LIBTEST_PORT_%lu", (unsigned long)construct.count()); - - char *var; - if ((var= getenv(variable_buffer))) + if (broken_socket_cleanup() and has_socket() and not socket().empty()) { - in_port_t tmp= in_port_t(atoi(var)); - - if (tmp > 0) - try_port= tmp; + unlink(socket().c_str()); } - } - Server *server= NULL; - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { -#ifdef GEARMAND_BINARY - #ifdef HAVE_LIBGEARMAN - server= build_gearmand("localhost", try_port); - #else - Error << "Libgearman was not found"; - #endif -#else - Error << "No gearmand binary is available"; -#endif - } - else if (server_type.compare("blobslap_worker") == 0) - { -#ifdef GEARMAND_BINARY - #ifdef HAVE_LIBGEARMAN - server= build_blobslap_worker(try_port); - #else - Error << "Libgearman was not found"; - #endif -#else - Error << "No gearmand binary is available"; -#endif - } - else if (server_type.compare("memcached") == 0) - { -#ifdef MEMCACHED_BINARY -#ifdef HAVE_LIBMEMCACHED - server= build_memcached("localhost", try_port); -#else - Error << "Libmemcached was not found"; -#endif -#else - Error << "No memcached binary is available"; -#endif - } - else - { - Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; - } - - if (server == NULL) - { - Error << "Failure occured while creating server: " << server_type; - return false; - } - - /* - We will now cycle the server we have created. - */ - if (not server->cycle()) - { - Error << "Could not start up server " << *server; - delete server; - return false; - } - - server->build(argc, argv); - - if (construct.is_debug()) - { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; - Out << "run " << server->args(options); - getchar(); - } - else if (not server->start()) - { - Error << "Failed to start " << *server; - delete server; - return false; - } - else - { - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - } - - construct.push_server(server); - - if (default_port() == 0) - { - assert(server->has_port()); - set_default_port(server->port()); - } - - Outn(); - - return true; -} - -bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]) -{ - (void)try_port; - Outn(); - - Server *server= NULL; - if (0) - { } - else if (server_type.compare("gearmand") == 0) - { - Error << "Socket files are not supported for gearmand yet"; - } - else if (server_type.compare("memcached") == 0) - { -#ifdef MEMCACHED_BINARY -#ifdef HAVE_LIBMEMCACHED - server= build_memcached_socket("localhost", try_port); -#else - Error << "Libmemcached was not found"; -#endif -#else - Error << "No memcached binary is available"; -#endif - } - else - { - Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; - } - - if (server == NULL) - { - Error << "Failure occured while creating server: " << server_type; - return false; - } - - /* - We will now cycle the server we have created. - */ - if (not server->cycle()) - { - Error << "Could not start up server " << *server; - delete server; - return false; - } - - server->build(argc, argv); + reset_pid(); - if (is_debug()) - { - Out << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; - Out << "run " << server->args(options); - getchar(); - } - else if (not server->start()) - { - Error << "Failed to start " << *server; - delete server; - return false; - } - else - { - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + return true; } - push_server(server); - - set_default_socket(server->socket().c_str()); - - Outn(); - - return true; + return false; } } // namespace libtest