Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[m6w6/libmemcached] / libtest / server.cc

diff --git a/libtest/server.cc b/libtest/server.cc
index c1d01c749e4d3353d32a63301904385448cd3dd1..41da231cf1ef3c25c73beb4919f8a05a2219bcf7 100644 (file)
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -25,12 +25,14 @@
 
 #include <cassert>
 #include <cerrno>
+#include <climits>
 #include <cstdlib>
 #include <iostream>
 
 #include <algorithm> 
 #include <functional> 
 #include <locale>
+#include <unistd.h>
 
 // trim from end 
 static inline std::string &rtrim(std::string &s)
@@ -159,11 +161,16 @@ bool Server::start()
   }
 #endif
 
-  if (getenv("YATL_VALGRIND_SERVER"))
+  if (getenv("YATL_PTRCHECK_SERVER"))
+  {
+    _app.use_ptrcheck();
+  }
+  else if (getenv("YATL_VALGRIND_SERVER"))
   {
     _app.use_valgrind();
   }
-  else if (args(_app) == false)
+
+  if (args(_app) == false)
   {
     Error << "Could not build command()";
     return false;
@@ -183,6 +190,7 @@ bool Server::start()
   }
 
   size_t repeat= 5;
+  _app.slurp();
   while (--repeat)
   {
     if (pid_file().empty() == false)
@@ -193,17 +201,22 @@ bool Server::start()
       {
         if (_app.check())
         {
+          _app.slurp();
           continue;
         }
 
+        char buf[PATH_MAX];
+        char *getcwd_buf= getcwd(buf, sizeof(buf));
         throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
-                             "Unable to open pidfile for: %s",
-                             _running.c_str());
+                             "Unable to open pidfile in %s for: %s stderr:%s",
+                             getcwd_buf ? getcwd_buf : "",
+                             _running.c_str(),
+                             _app.stderr_c_str());
       }
     }
   }
 
-  uint32_t this_wait;
+  uint32_t this_wait= 0;
   bool pinged= false;
   {
     uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow)
@@ -231,20 +244,32 @@ bool Server::start()
     // If we happen to have a pid file, lets try to kill it
     if ((pid_file().empty() == false) and (access(pid_file().c_str(), R_OK) == 0))
     {
+      _app.slurp();
       if (kill_file(pid_file()) == false)
       {
-        throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Failed to kill off server after startup occurred, when pinging failed: %s", pid_file().c_str());
+        throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+                             "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %s stderr:%s",
+                             this_wait,
+                             pid_file().c_str(),
+                             _app.stderr_c_str());
       }
 
       throw libtest::fatal(LIBYATL_DEFAULT_PARAM, 
-                           "Failed to ping(), waited: %u server started, having pid_file. exec: %s error:%s",
-                           this_wait, _running.c_str(), _app.stderr_c_str()); 
+                           "Failed native ping(), pid: %d is alive: %s waited: %u server started, having pid_file. exec: %s stderr:%s",
+                           int(_app.pid()),
+                           _app.check() ? "true" : "false",
+                           this_wait, _running.c_str(), 
+                           _app.stderr_c_str());
     }
     else
     {
       throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
-                           "Failed to ping() server started. exec: %s",
-                           _running.c_str());
+                           "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %s stderr:%s",
+                           int(_app.pid()),
+                           _app.check() ? "true" : "false",
+                           this_wait,
+                           _running.c_str(),
+                           _app.stderr_c_str());
     }
     _running.clear();
     return false;
@@ -319,8 +344,7 @@ bool Server::set_pid_file()
   int fd;
   if ((fd= mkstemp(file_buffer)) == -1)
   {
-    perror(file_buffer);
-    return false;
+    throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
   }
   close(fd);
   unlink(file_buffer);
@@ -352,7 +376,7 @@ bool Server::args(Application& app)
 {
 
   // Set a log file if it was requested (and we can)
-  if (false and has_log_file_option())
+  if (has_log_file_option())
   {
     set_log_file();
     log_file_option(app, _log_file);