X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=9d492b9b84aa1d902f6e8a30a8cddee6fbf6062d;hb=81655759c1b673655289d977b2b755c3c9ec4f74;hp=ed7e87f11672ffe0c547d4a4d7d8e85b4a7231c2;hpb=28602fd2f5f1c758b50cd82d4545da8e6c55f5c7;p=m6w6%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index ed7e87f1..9d492b9b 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -1,39 +1,25 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: * - * Libtest library + * libtest * * Copyright (C) 2011 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 - * met: + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include #include @@ -56,13 +42,41 @@ static inline std::string &rtrim(std::string &s) #include #include -#ifdef HAVE_LIBGEARMAN -#include -#endif +extern "C" { + static bool exited_successfully(int status, const std::string &command) + { + if (status == 0) + { + return true; + } + + if (WIFEXITED(status) == true) + { + int ret= WEXITSTATUS(status); + + if (ret == 0) + { + return true; + } + else if (ret == EXIT_FAILURE) + { + libtest::Error << "Command executed, but returned EXIT_FAILURE: " << command; + } + else + { + libtest::Error << "Command executed, but returned " << ret; + } + } + else if (WIFSIGNALED(status) == true) + { + int ret_signal= WTERMSIG(status); + libtest::Error << "Died from signal " << strsignal(ret_signal); + } + + return false; + } +} -#ifdef HAVE_LIBMEMCACHED -#include -#endif namespace libtest { @@ -96,16 +110,6 @@ std::ostream& operator<<(std::ostream& output, const Server &arg) 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 -} - Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) : _is_socket(is_socket_arg), _pid(-1), @@ -116,19 +120,12 @@ Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_so Server::~Server() { - if (has_pid() and not kill()) + if (has_pid() and not kill(_pid)) { Error << "Unable to kill:" << *this; } } -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,12 +133,12 @@ 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()) + if (kill(current_pid)) { Log << "Killed existing server," << *this << " with pid:" << current_pid; - nap(); + dream(0, 50000); continue; } } @@ -171,55 +168,81 @@ 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. - if (has_pid() and not kill()) + if (has_pid() and kill(_pid) == false) { - Error << "Could not kill() existing server during start()"; + Error << "Could not kill() existing server during start() pid:" << _pid; return false; } assert(not has_pid()); _running.clear(); - if (not command(_running)) + if (command(_running) == false) { Error << "Could not build command()"; return false; } - if (system(_running.c_str()) == -1) + if (is_valgrind() or is_helgrind()) { - Error << "system() failed:" << strerror(errno); + _running+= " &"; + } + + int ret= system(_running.c_str()); + if (exited_successfully(ret, _running) == false) + { + Error << "system(" << _running << ") failed: " << strerror(errno); _running.clear(); return false; } - if (pid_file_option() and not pid_file().empty()) + if (is_helgrind() or is_valgrind()) + { + dream(5, 50000); + } + + if (pid_file_option() and pid_file().empty() == false) { - 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= 5; - while (not ping() and --count) + int counter= 0; + bool pinged= false; + while ((pinged= ping()) == false and + counter < (is_helgrind() or is_valgrind() ? 20 : 5)) { - nap(); + dream(counter++, 50000); } - if (count == 0) + if (pinged == false) { - 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 pid_file().empty() == false) + { + Error << "We are going to kill it off"; + kill_file(pid_file()); + } + Error << "Failed to ping() server started with:" << _running; _running.clear(); return false; } // A failing get_pid() at this point is considered an error - _pid= get_pid(false); + _pid= get_pid(true); return has_pid(); } @@ -247,7 +270,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; @@ -275,7 +298,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; @@ -297,7 +320,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) { @@ -316,16 +339,33 @@ void Server::rebuild_base_command() _base_command.clear(); if (is_libtool()) { - _base_command+= "./libtool --mode=execute "; + _base_command+= libtool(); + _base_command+= " --mode=execute "; } - if (is_debug()) + 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")) { - _base_command+= "gdb "; + _base_command+= getenv("HELGRIND_COMMAND"); + _base_command+= " "; } - else if (is_valgrind()) + + if (is_libtool()) { - _base_command+= "valgrind --log-file=tests/var/tmp/valgrind.out --leak-check=full --show-reachable=yes "; + if (getenv("PWD")) + { + _base_command+= getenv("PWD"); + _base_command+= "/"; + } } _base_command+= executable(); @@ -344,22 +384,31 @@ bool Server::args(std::string& options) if (getenv("LIBTEST_LOG") and log_file_option()) { if (not set_log_file()) + { return false; + } arg_buffer << " " << log_file_option() << _log_file; } + if (getenv("LIBTEST_SYSLOG") and has_syslog()) + { + arg_buffer << " --syslog"; + } + // Update pid_file if (pid_file_option()) { - if (not set_pid_file()) + if (_pid_file.empty() and set_pid_file() == false) + { return false; + } arg_buffer << " " << pid_file_option() << pid_file(); } assert(daemon_file_option()); - if (daemon_file_option()) + if (daemon_file_option() and not is_valgrind() and not is_helgrind()) { arg_buffer << " " << daemon_file_option(); } @@ -367,7 +416,9 @@ bool Server::args(std::string& options) if (_is_socket and socket_file_option()) { if (not set_socket_file()) + { return false; + } arg_buffer << " " << socket_file_option() << "\"" << _socket << "\""; } @@ -381,7 +432,9 @@ bool Server::args(std::string& options) options+= arg_buffer.str(); if (not _extra_args.empty()) + { options+= _extra_args; + } return true; } @@ -396,269 +449,31 @@ bool Server::is_valgrind() const return bool(getenv("LIBTEST_MANUAL_VALGRIND")); } -bool Server::kill() -{ - if (has_pid() and kill_pid(_pid)) // If we kill it, reset - { - if (broken_pid_file() and not pid_file().empty()) - { - 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() +bool Server::is_helgrind() const { - Server *tmp= servers.back(); - servers.pop_back(); - return tmp; + return bool(getenv("LIBTEST_MANUAL_HELGRIND")); } -void server_startup_st::shutdown(bool remove) +bool Server::kill(pid_t pid_arg) { - if (remove) - { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) - { - delete *iter; - } - servers.clear(); - } - else + if (check_pid(pid_arg) and kill_pid(pid_arg)) // If we kill it, reset { - for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) + if (broken_pid_file() and pid_file().empty() == false) { - if ((*iter)->has_pid() and not (*iter)->kill()) - { - Error << "Unable to kill:" << *(*iter); - } + unlink(pid_file().c_str()); } - } -} - -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(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[]) -{ - Logn(); - - // 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("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()) - { - Log << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; - Log << "run " << server->args(options); - getchar(); - } - else if (not server->start()) - { - Error << "Failed to start " << *server; - delete server; - return false; - } - else - { - Log << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); - } - - construct.push_server(server); - - if (default_port() == 0) - { - assert(server->has_port()); - set_default_port(server->port()); - } - - Logn(); - - 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[]) -{ - Logn(); - - 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()) - { - Log << "Pausing for startup, hit return when ready."; - std::string gdb_command= server->base_command(); - std::string options; - Log << "run " << server->args(options); - getchar(); - } - else if (not server->start()) - { - Error << "Failed to start " << *server; - delete server; - return false; - } - else - { - Log << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + return true; } - push_server(server); - - set_default_socket(server->socket().c_str()); - - Logn(); - - return true; + return false; } } // namespace libtest