X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fkillpid.cc;h=4f8f3370cb1c04a42133f959af3516b7c6c74a89;hb=23dca174eef8d846e3d4402729b57f6ded035e64;hp=1d5992db175cd486b2897de1c7f10ce85155c6b1;hpb=582b47ae25f9fecc459204592f23491297488cd8;p=m6w6%2Flibmemcached

diff --git a/libtest/killpid.cc b/libtest/killpid.cc
index 1d5992db..4f8f3370 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
@@ -34,11 +34,13 @@
  *
  */
 
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
+#include <sstream>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/types.h>
@@ -78,35 +80,76 @@ 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= 4; ; 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)
+      {
+        break;
+      }
+      else if (errno == ECHILD)
+      {
+        // Server has already gone away
+        break;
+      }
+      else if (waited >= timeout)
       {
-        return true;
+        // Timeout failed
+        kill(pid_arg, SIGKILL);
+        break;
       }
+
+      this_wait= retry * retry / 3 + 1;
+      libtest::dream(this_wait, 0);
     }
+  }
 
-    Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(pid_arg);
+  return true;
+}
 
+bool check_pid(const std::string &filename)
+{
+  if (filename.empty())
+  {
     return false;
   }
 
-  return true;
+  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;
 }
 
 
-pid_t kill_file(const std::string &filename)
+bool kill_file(const std::string &filename)
 {
-  pid_t ret= -1;
-  FILE *fp;
-
   if (filename.empty())
-    return ret;
+  {
+    return true;
+  }
 
+  FILE *fp;
   if ((fp= fopen(filename.c_str(), "r")))
   {
     char pid_buffer[1024];
@@ -119,23 +162,29 @@ pid_t 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 ret;
+  return false;
 }
 
-pid_t get_pid_from_file(const std::string &filename)
+#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 << "empty pid file";
+    error_message << LIBTEST_AT << " empty pid file";
     return ret;
   }
 
@@ -149,11 +198,23 @@ pid_t get_pid_from_file(const std::string &filename)
     if (ptr)
     {
       ret= (pid_t)atoi(pid_buffer);
-      if (ret <= 0)
+      if (ret < 1)
       {
-        return ret;
+        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;