X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=b63cfbb4de6787719081091687ad788834086289;hb=5b98081c95814fdc00882787f63ab4d169d6fcc5;hp=bba1240cabc5019022c6e5f3250a55604776669d;hpb=969fea8e7bed82c109685ec3976cf7b0ec514ae9;p=m6w6%2Flibmemcached diff --git a/libtest/server_container.cc b/libtest/server_container.cc index bba1240c..b63cfbb4 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -77,12 +78,11 @@ Server* server_startup_st::pop_server() bool server_startup_st::shutdown(uint32_t number_of_host) { - assert(servers.size() > number_of_host); if (servers.size() > number_of_host) { Server* tmp= servers[number_of_host]; - if (tmp and tmp->has_pid() and not tmp->kill(tmp->pid())) + if (tmp and tmp->has_pid() and tmp->kill() == false) { } else { @@ -102,15 +102,33 @@ void server_startup_st::shutdown_and_remove() servers.clear(); } -void server_startup_st::shutdown() +bool server_startup_st::check() const { + bool success= true; + for (std::vector::const_iterator iter= servers.begin(); iter != servers.end(); iter++) + { + if ((*iter)->check() == false) + { + success= false; + } + } + + return success; +} + +bool server_startup_st::shutdown() +{ + bool success= true; for (std::vector::iterator iter= servers.begin(); iter != servers.end(); iter++) { - if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid())) + if ((*iter)->has_pid() and (*iter)->kill() == false) { Error << "Unable to kill:" << *(*iter); + success= false; } } + + return success; } void server_startup_st::restart() @@ -121,45 +139,31 @@ void server_startup_st::restart() } } +#define MAGIC_MEMORY 123575 +server_startup_st::server_startup_st() : + _magic(MAGIC_MEMORY), + _socket(false), + _sasl(false), + _count(0), + udp(0), + _servers_to_run(5) +{ } + server_startup_st::~server_startup_st() { shutdown_and_remove(); } -bool server_startup_st::is_debug() const +bool server_startup_st::validate() { - return bool(getenv("LIBTEST_MANUAL_GDB")); + return _magic == MAGIC_MEMORY; } -bool server_startup_st::is_valgrind() const +bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message) { - 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 + if (try_port <= 0) { - char variable_buffer[1024]; - snprintf(variable_buffer, sizeof(variable_buffer), "LIBTEST_PORT_%lu", (unsigned long)construct.count()); - - char *var; - if ((var= getenv(variable_buffer))) - { - in_port_t tmp= in_port_t(atoi(var)); - - if (tmp > 0) - try_port= tmp; - } + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port)); } libtest::Server *server= NULL; @@ -173,32 +177,19 @@ bool server_startup(server_startup_st& construct, const std::string& server_type { server= build_gearmand("localhost", try_port); } - else - { - Error << "Libgearman was not found"; - } - } - else - { - Error << "No gearmand binary is available"; } } else if (server_type.compare("blobslap_worker") == 0) { - if (GEARMAND_BINARY and GEARMAND_BLOBSLAP_WORKER) + if (GEARMAND_BINARY) { - if (HAVE_LIBGEARMAN) + if (GEARMAND_BLOBSLAP_WORKER) { - server= build_blobslap_worker(try_port); + if (HAVE_LIBGEARMAN) + { + server= build_blobslap_worker(try_port); + } } - else - { - Error << "Libgearman was not found"; - } - } - else - { - Error << "No gearmand binary is available"; } } else if (server_type.compare("memcached-sasl") == 0) @@ -209,14 +200,6 @@ bool server_startup(server_startup_st& construct, const std::string& server_type { server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password()); } - else - { - Error << "Libmemcached was not found"; - } - } - else - { - Error << "No memcached binary that was compiled with sasl is available"; } } else if (server_type.compare("memcached") == 0) @@ -227,31 +210,28 @@ bool server_startup(server_startup_st& construct, const std::string& server_type { server= build_memcached("localhost", try_port); } - else - { - Error << "Libmemcached was not found"; - } - } - else - { - Error << "No memcached binary is available"; } } - else + else if (server_type.compare("memcached-light") == 0) { - Error << "Failed to start " << server_type << ", no support was found to be compiled in for it."; + if (MEMCACHED_LIGHT_BINARY) + { + if (HAVE_LIBMEMCACHED) + { + server= build_memcached_light("localhost", try_port); + } + } } if (server == NULL) { - Error << "Failure occured while creating server: " << server_type; - return false; + fatal_message("Launching of an unknown server was attempted"); } /* We will now cycle the server we have created. */ - if (not server->cycle()) + if (server->cycle() == false) { Error << "Could not start up server " << *server; delete server; @@ -260,35 +240,33 @@ bool server_startup(server_startup_st& construct, const std::string& server_type server->build(argc, argv); - if (construct.is_debug()) + if (false) { Out << "Pausing for startup, hit return when ready."; std::string gdb_command= server->base_command(); std::string options; +#if 0 Out << "run " << server->args(options); +#endif getchar(); } - else if (not server->start()) + else if (server->start() == false) { - Error << "Failed to start " << *server; delete server; return false; } else { - Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + if (opt_startup_message) + { + Outn(); + Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running(); + Outn(); + } } construct.push_server(server); - if (default_port() == 0) - { - assert(server->has_port()); - set_default_port(server->port()); - } - - Outn(); - return true; } @@ -354,7 +332,7 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons /* We will now cycle the server we have created. */ - if (not server->cycle()) + if (server->cycle() == false) { Error << "Could not start up server " << *server; delete server; @@ -363,15 +341,17 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons server->build(argc, argv); - if (is_debug()) + if (false) { Out << "Pausing for startup, hit return when ready."; std::string gdb_command= server->base_command(); std::string options; +#if 0 Out << "run " << server->args(options); +#endif getchar(); } - else if (not server->start()) + else if (server->start() == false) { Error << "Failed to start " << *server; delete server;