X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fkillpid.cc;h=aae43bb391bc12729bf82648653ecf4892708627;hb=9b13e23dc5a1c11b93cefc9f188cf459af68bede;hp=e963f4a7eab1e7fa53d979c97cc24ccc26003cf1;hpb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;p=awesomized%2Flibmemcached

diff --git a/libtest/killpid.cc b/libtest/killpid.cc
index e963f4a7..aae43bb3 100644
--- a/libtest/killpid.cc
+++ b/libtest/killpid.cc
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 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
@@ -35,67 +35,108 @@
  */
 
 #include <config.h>
+#include <libtest/common.h>
 
-#include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
+#include <sstream>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
 
 #include <libtest/killpid.h>
+#include <libtest/stream.h>
+
+using namespace libtest;
 
 bool kill_pid(pid_t pid_arg)
 {
-  if ((kill(pid_arg, SIGTERM) == -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];
@@ -108,9 +149,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;
 }