X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=603b3f4577083b354a60e08929466e0af1750591;hb=5d66b2f99bf7de6f54a3e463b01542b997f68ac8;hp=d5329b11971851b1e04c50fa28aeb2735443d38a;hpb=3c4d734f56530d43520f385bff97162c04ac81ac;p=m6w6%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index d5329b11..603b3f45 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,18 @@ static inline std::string &rtrim(std::string &s) #include #include -#ifdef HAVE_LIBGEARMAN -#include -#endif +extern "C" { + static bool exited_successfully(int status) + { + if (WEXITSTATUS(status) == 0) + { + return true; + } + + return true; + } +} -#ifdef HAVE_LIBMEMCACHED -#include -#endif namespace libtest { @@ -136,7 +127,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)) { @@ -193,29 +184,30 @@ bool Server::start() _running+= " &"; } - if (system(_running.c_str()) == -1) + int ret= system(_running.c_str()); + if (not exited_successfully(ret)) { Error << "system() failed:" << strerror(errno); _running.clear(); 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(); @@ -223,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; } @@ -257,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; @@ -285,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; @@ -307,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) { @@ -326,21 +323,23 @@ void Server::rebuild_base_command() _base_command.clear(); if (is_libtool()) { - _base_command+= "./libtool --mode=execute "; + _base_command+= libtool(); } - if (is_debug()) + if (is_debug() and getenv("GDB_COMMAND")) { - _base_command+= "gdb "; + _base_command+= getenv("GDB_COMMAND"); + _base_command+= " "; } - else if (is_valgrind()) + else if (is_valgrind() and getenv("VALGRIND_COMMAND")) { - _base_command+= "valgrind --log-file=tests/var/tmp/valgrind.out --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE "; - + _base_command+= getenv("VALGRIND_COMMAND"); + _base_command+= " "; } - else if (is_helgrind()) + else if (is_helgrind() and getenv("HELGRIND_COMMAND")) { - _base_command+= "valgrind --log-file=tests/var/tmp/helgrind.out --tool=helgrind --read-var-info=yes --error-exitcode=1 -v "; + _base_command+= getenv("HELGRIND_COMMAND"); + _base_command+= " "; } _base_command+= executable(); @@ -359,7 +358,9 @@ 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; } @@ -367,8 +368,10 @@ 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; + } arg_buffer << " " << pid_file_option() << pid_file(); } @@ -382,7 +385,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 << "\""; } @@ -396,7 +401,9 @@ bool Server::args(std::string& options) options+= arg_buffer.str(); if (not _extra_args.empty()) + { options+= _extra_args; + } return true; } @@ -425,6 +432,11 @@ bool Server::kill(pid_t pid_arg) unlink(pid_file().c_str()); } + if (broken_socket_cleanup() and has_socket() and not socket().empty()) + { + unlink(socket().c_str()); + } + reset_pid(); return true; @@ -515,6 +527,7 @@ bool server_startup_st::is_helgrind() const 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 { @@ -531,32 +544,80 @@ bool server_startup(server_startup_st& construct, const std::string& server_type } } - Server *server= NULL; + libtest::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 + if (GEARMAND_BINARY) + { + if (HAVE_LIBGEARMAN) + { + 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 (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) + { + if (MEMCACHED_SASL_BINARY) + { + if (HAVE_LIBMEMCACHED) + { + 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) { -#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 + if (MEMCACHED_BINARY) + { + if (HAVE_LIBMEMCACHED) + { + server= build_memcached("localhost", try_port); + } + else + { + Error << "Libmemcached was not found"; + } + } + else + { + Error << "No memcached binary is available"; + } } else { @@ -625,17 +686,41 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons { Error << "Socket files are not supported for gearmand yet"; } + else if (server_type.compare("memcached-sasl") == 0) + { + if (MEMCACHED_SASL_BINARY) + { + if (HAVE_LIBMEMCACHED) + { + server= build_memcached_sasl_socket("localhost", try_port, username(), password()); + } + else + { + Error << "Libmemcached was not found"; + } + } + else + { + Error << "No memcached binary is available"; + } + } 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 + if (MEMCACHED_BINARY) + { + if (HAVE_LIBMEMCACHED) + { + server= build_memcached_socket("localhost", try_port); + } + else + { + Error << "Libmemcached was not found"; + } + } + else + { + Error << "No memcached binary is available"; + } } else {