X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fkillpid.cc;h=2cefff2c60642170b414b86a5ebf344dcecb0507;hb=ae86283e79c226f2a24d5c74e3ffc8f38f0a66a8;hp=cfc9316f34e2b02976060ffb09035077aa07fb5a;hpb=a67b1fe8d0b14a166ec0f6028a0ec40dc390e37e;p=awesomized%2Flibmemcached diff --git a/libtest/killpid.cc b/libtest/killpid.cc index cfc9316f..2cefff2c 100644 --- a/libtest/killpid.cc +++ b/libtest/killpid.cc @@ -1,26 +1,40 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * 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. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * 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. * - * 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 "libtest/yatlcon.h" #include #include @@ -66,21 +80,34 @@ bool kill_pid(pid_t pid_arg) } } - int status= 0; - if (waitpid(pid_arg, &status, 0) == -1) { - switch (errno) + uint32_t this_wait= 0; + 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) { - // Just means that the server has already gone away - case ECHILD: + int status= 0; + if (waitpid(pid_arg, &status, WNOHANG) == 0) { - return true; + break; + } + else if (errno == ECHILD) + { + // Server has already gone away + break; + } + else if (waited >= timeout) + { + // Timeout failed + kill(pid_arg, SIGKILL); + break; } - } - - Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(pid_arg); - return false; + this_wait= retry * retry / 3 + 1; + libtest::dream(this_wait, 0); + } } return true; @@ -96,14 +123,15 @@ bool check_pid(const std::string &filename) FILE *fp; if ((fp= fopen(filename.c_str(), "r"))) { - char pid_buffer[1024]; + libtest::vchar_t pid_buffer; + pid_buffer.resize(1024); - char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp); + char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp); fclose(fp); if (ptr) { - pid_t pid= (pid_t)atoi(pid_buffer); + pid_t pid= (pid_t)atoi(&pid_buffer[0]); if (pid > 0) { return (::kill(pid, 0) == 0); @@ -125,14 +153,15 @@ bool kill_file(const std::string &filename) FILE *fp; if ((fp= fopen(filename.c_str(), "r"))) { - char pid_buffer[1024]; + libtest::vchar_t pid_buffer; + pid_buffer.resize(1024); - char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp); + char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp); fclose(fp); if (ptr) { - pid_t pid= (pid_t)atoi(pid_buffer); + pid_t pid= (pid_t)atoi(&pid_buffer[0]); if (pid != 0) { bool ret= kill_pid(pid); @@ -153,7 +182,6 @@ bool kill_file(const std::string &filename) pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message) { pid_t ret= -1; - FILE *fp; if (filename.empty()) { @@ -161,16 +189,16 @@ pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_me return ret; } + FILE *fp; if ((fp= fopen(filename.c_str(), "r"))) { - char pid_buffer[1024]; - - char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp); - fclose(fp); + libtest::vchar_t pid_buffer; + pid_buffer.resize(1024); + char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp); if (ptr) { - ret= (pid_t)atoi(pid_buffer); + ret= (pid_t)atoi(&pid_buffer[0]); if (ret < 1) { error_message << LIBTEST_AT << " Invalid pid was read from file " << filename; @@ -181,12 +209,15 @@ pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_me error_message << LIBTEST_AT << " File " << filename << " was empty "; } + fclose(fp); + return ret; } else { - char buffer[1024]; - char *current_directory= getcwd(buffer, sizeof(buffer)); + libtest::vchar_t buffer; + buffer.resize(1024); + char *current_directory= getcwd(&buffer[0], buffer.size()); error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno); }