X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fkillpid.cc;h=cfc9316f34e2b02976060ffb09035077aa07fb5a;hb=60f2851fbf579b4266b316567fbde641049073a2;hp=ca8a659b80b798580e0725499f81a51090b8aaf2;hpb=12a07e58df95bb8dbe167e4157b29c910177ade8;p=m6w6%2Flibmemcached diff --git a/libtest/killpid.cc b/libtest/killpid.cc index ca8a659b..cfc9316f 100644 --- a/libtest/killpid.cc +++ b/libtest/killpid.cc @@ -1,104 +1,128 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: * - * uTest + * 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 -#include #include #include #include +#include +#include +#include +#include +#include + #include +#include + +using namespace libtest; bool kill_pid(pid_t pid_arg) { - if (pid_arg <= 1) + assert(pid_arg > 0); + if (pid_arg < 1) + { + Error << "Invalid pid:" << pid_arg; return false; + } if ((::kill(pid_arg, SIGTERM) == -1)) { switch (errno) { case EPERM: - perror(__func__); - std::cerr << __func__ << " -> Does someone else have a process running locally for " << int(pid_arg) << "?" << std::endl; + Error << "Does someone else have a process running locally for " << int(pid_arg) << "?"; return false; case ESRCH: - perror(__func__); - std::cerr << "Process " << int(pid_arg) << " not found." << std::endl; + Error << "Process " << int(pid_arg) << " not found."; return false; default: case EINVAL: - perror(__func__); + Error << "kill() " << strerror(errno); return false; } } int status= 0; - pid_t pid= waitpid(pid_arg, &status, 0); - if (pid == -1) + if (waitpid(pid_arg, &status, 0) == -1) { switch (errno) { + // Just means that the server has already gone away case ECHILD: - return true; + { + return true; + } } - std::cerr << std::endl << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(pid_arg) << std::endl; + + Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(pid_arg); + return false; } - if (WIFEXITED(status)) - return true; + return true; +} - if (WCOREDUMP(status)) - return true; +bool check_pid(const std::string &filename) +{ + if (filename.empty()) + { + return false; + } + + FILE *fp; + if ((fp= fopen(filename.c_str(), "r"))) + { + char pid_buffer[1024]; + + char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp); + fclose(fp); + if (ptr) + { + pid_t pid= (pid_t)atoi(pid_buffer); + if (pid > 0) + { + return (::kill(pid, 0) == 0); + } + } + } + return false; } -void kill_file(const std::string &filename) +bool kill_file(const std::string &filename) { - FILE *fp; - if (filename.empty()) - return; + { + return true; + } + FILE *fp; if ((fp= fopen(filename.c_str(), "r"))) { char pid_buffer[1024]; @@ -111,9 +135,60 @@ void kill_file(const std::string &filename) pid_t pid= (pid_t)atoi(pid_buffer); if (pid != 0) { - kill_pid(pid); + bool ret= kill_pid(pid); unlink(filename.c_str()); // If this happens we may be dealing with a dead server that left its pid file. + + return ret; } } } + + return false; +} + +#define STRINGIFY(x) #x +#define TOSTRING(x) STRINGIFY(x) +#define LIBTEST_AT __FILE__ ":" TOSTRING(__LINE__) + +pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message) +{ + pid_t ret= -1; + FILE *fp; + + if (filename.empty()) + { + error_message << LIBTEST_AT << " empty pid file"; + return ret; + } + + if ((fp= fopen(filename.c_str(), "r"))) + { + char pid_buffer[1024]; + + char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp); + fclose(fp); + + if (ptr) + { + ret= (pid_t)atoi(pid_buffer); + if (ret < 1) + { + error_message << LIBTEST_AT << " Invalid pid was read from file " << filename; + } + } + else + { + error_message << LIBTEST_AT << " File " << filename << " was empty "; + } + + return ret; + } + else + { + char buffer[1024]; + char *current_directory= getcwd(buffer, sizeof(buffer)); + error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno); + } + + return ret; }