X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fkillpid.cc;h=2cefff2c60642170b414b86a5ebf344dcecb0507;hb=1d0993d84fd87ef620f60380745914bac3e77d34;hp=bc9a55941d7b8e5817395cc19a34cea9a0ef1c83;hpb=04b8554c3724eae57fbd75dc6b3e69dca8b58187;p=awesomized%2Flibmemcached

diff --git a/libtest/killpid.cc b/libtest/killpid.cc
index bc9a5594..2cefff2c 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 "libtest/yatlcon.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,49 +80,146 @@ 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)
+      {
+        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")))
+  {
+    libtest::vchar_t pid_buffer;
+    pid_buffer.resize(1024);
+
+    char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
+    fclose(fp);
+
+    if (ptr)
+    {
+      pid_t pid= (pid_t)atoi(&pid_buffer[0]);
+      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];
+    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)
       {
-        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;
+
+  if (filename.empty())
+  {
+    error_message << LIBTEST_AT << " empty pid file";
+    return ret;
+  }
+
+  FILE *fp;
+  if ((fp= fopen(filename.c_str(), "r")))
+  {
+    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[0]);
+      if (ret < 1)
+      {
+        error_message << LIBTEST_AT << " Invalid pid was read from file " << filename;
+      }
+    }
+    else
+    {
+      error_message << LIBTEST_AT << " File " << filename << " was empty ";
+    }
+
+    fclose(fp);
+
+    return ret;
+  }
+  else
+  {
+    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);
+  }
+  
+  return ret;
 }