X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.cc;h=6807c338af6fe20e69efffdff9be152e05ae9b09;hb=e268471e4642c16281dc65b2f0ad9b897786c0b4;hp=6c71f9b0935a13f8b4b78f49f864010dc82c016e;hpb=6b2e8e60c388754cbe4f9bb3eb38f870544615c8;p=m6w6%2Flibmemcached

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 6c71f9b0..6807c338 100644
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -21,45 +21,416 @@
 
 #include <libtest/common.h>
 
-#include <libtest/cmdline.h>
-
 using namespace libtest;
 
 #include <cstdlib>
-#include <string>
+#include <cstring>
+#include <fcntl.h>
+#include <memory>
+#include <spawn.h>
 #include <sstream>
+#include <string>
+#include <sys/stat.h>
+#include <sys/types.h>
 
-bool exec_cmdline(const std::string& executable, const char *args[])
-{
-  std::stringstream arg_buffer;
+extern "C" {
+  static int exited_successfully(int status)
+  {
+    if (status == 0)
+    {
+      return EXIT_SUCCESS;
+    }
+
+    if (WIFEXITED(status) == true)
+    {
+      return WEXITSTATUS(status);
+    }
+    else if (WIFSIGNALED(status) == true)
+    {
+      return WTERMSIG(status);
+    }
+
+    return EXIT_FAILURE;
+  }
+}
 
-  arg_buffer << "./libtool --mode=execute ";
+namespace {
 
-  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
+  std::string print_argv(char * * & built_argv, const size_t& argc, const pid_t& pid)
   {
-    arg_buffer << getenv("LIBTEST_TEST_ENVIRONMENT");
-    arg_buffer << " ";
+    std::stringstream arg_buffer;
+
+    for (size_t x= 0; x < argc; x++)
+    {
+      arg_buffer << built_argv[x] << " ";
+    }
+
+    return arg_buffer.str();
   }
 
-  arg_buffer << executable;
-  for (const char **ptr= args; *ptr; ++ptr)
+  static Application::error_t int_to_error_t(int arg)
   {
-    arg_buffer << " " << *ptr;
+    switch (arg)
+    {
+    case 127:
+      return Application::INVALID;
+
+    case 0:
+      return Application::SUCCESS;
+
+    default:
+    case 1:
+      return Application::FAILURE;
+    }
   }
+}
+
+namespace libtest {
 
-  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
+Application::Application(const std::string& arg, const bool _use_libtool_arg) :
+  _use_libtool(_use_libtool_arg),
+  _argc(0),
+  _exectuble(arg),
+  built_argv(NULL),
+  _pid(-1)
+  { 
+    if (_use_libtool)
+    {
+      if (libtool() == NULL)
+      {
+        throw "libtool requested, but know libtool was found";
+      }
+    }
+
+    if (_use_libtool and getenv("PWD"))
+    {
+      _exectuble_with_path+= getenv("PWD");
+      _exectuble_with_path+= "/";
+    }
+    _exectuble_with_path+= _exectuble;
+  }
+
+Application::~Application()
+{
+  delete_argv();
+}
+
+Application::error_t Application::run(const char *args[])
+{
+  stdin_fd.reset();
+  stdout_fd.reset();
+  stderr_fd.reset();
+  _stdout_buffer.clear();
+  _stderr_buffer.clear();
+
+  posix_spawn_file_actions_t file_actions;
+  posix_spawn_file_actions_init(&file_actions);
+
+  stdin_fd.dup_for_spawn(Application::Pipe::READ, file_actions, STDIN_FILENO);
+  stdout_fd.dup_for_spawn(Application::Pipe::WRITE, file_actions, STDOUT_FILENO);
+  stderr_fd.dup_for_spawn(Application::Pipe::WRITE, file_actions, STDERR_FILENO);
+  
+  create_argv(args);
+
+  int spawn_ret;
+  if (_use_libtool)
   {
-    std::cerr << std::endl << arg_buffer.str() << std::endl;
+    spawn_ret= posix_spawn(&_pid, built_argv[0], &file_actions, NULL, built_argv, NULL);
   }
   else
   {
-    arg_buffer << " > /dev/null 2>&1";
+    spawn_ret= posix_spawnp(&_pid, built_argv[0], &file_actions, NULL, built_argv, NULL);
+  }
+
+  posix_spawn_file_actions_destroy(&file_actions);
+
+  stdin_fd.close(Application::Pipe::READ);
+  stdout_fd.close(Application::Pipe::WRITE);
+  stderr_fd.close(Application::Pipe::WRITE);
+
+  if (spawn_ret)
+  {
+    Error << print();
+    return Application::INVALID;
+  }
+
+  return Application::SUCCESS;
+}
+
+Application::error_t Application::wait()
+{
+  if (_pid == -1)
+  {
+    Error << "wait() got an invalid pid_t";
+    return Application::INVALID;
+  }
+
+  {
+    ssize_t read_length;
+    char buffer[1024]= { 0 };
+    bool bail= false;
+    while (((read_length= ::read(stdout_fd.fd()[0], buffer, sizeof(buffer))) != 0) or bail)
+    {
+      if (read_length == -1)
+      {
+        switch(errno)
+        {
+        case EAGAIN:
+          continue;
+
+        default:
+          Error << strerror(errno);
+          bail= true;
+        }
+      }
+      _stdout_buffer.reserve(read_length +1);
+      for (size_t x= 0; x < read_length; x++)
+      {
+        _stdout_buffer.push_back(buffer[x]);
+      }
+      // @todo Suck up all output code here
+    }
+  }
+
+  {
+    ssize_t read_length;
+    char buffer[1024]= { 0 };
+    bool bail= false;
+    while (((read_length= ::read(stderr_fd.fd()[0], buffer, sizeof(buffer))) != 0) or bail)
+    {
+      if (read_length == -1)
+      {
+        switch(errno)
+        {
+        case EAGAIN:
+          continue;
+
+        default:
+          Error << strerror(errno);
+          bail= true;
+        }
+      }
+      _stderr_buffer.reserve(read_length +1);
+      for (size_t x= 0; x < read_length; x++)
+      {
+        _stderr_buffer.push_back(buffer[x]);
+      }
+      // @todo Suck up all errput code here
+    }
+  }
+
+  error_t exit_code= FAILURE;
+  {
+    int status= 0;
+    pid_t waited_pid;
+    if ((waited_pid= waitpid(_pid, &status, 0)) == -1)
+    {
+      Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(_pid);
+    }
+    else
+    {
+      if (waited_pid != _pid)
+      {
+        throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Pid mismatch, %d != %d", int(waited_pid), int(_pid));
+      }
+      exit_code= int_to_error_t(exited_successfully(status));
+    }
+  }
+
+  if (exit_code == Application::INVALID)
+  {
+    Error << print_argv(built_argv, _argc, _pid);
+  }
+
+  return exit_code;
+}
+
+void Application::add_option(const std::string& arg)
+{
+  _options.push_back(std::make_pair(arg, std::string()));
+}
+
+void Application::add_option(const std::string& name, const std::string& value)
+{
+  _options.push_back(std::make_pair(name, value));
+}
+
+Application::Pipe::Pipe()
+{
+  _fd[0]= -1;
+  _fd[1]= -1;
+  _open[0]= false;
+  _open[1]= false;
+}
+
+void Application::Pipe::reset()
+{
+  close(READ);
+  close(WRITE);
+
+  int ret;
+  if ((ret= pipe(_fd)) < 0)
+  {
+    throw strerror(ret);
   }
+  _open[0]= true;
+  _open[1]= true;
 
-  if (system(arg_buffer.str().c_str()) == -1)
   {
-    return false;
+    ret= fcntl(_fd[0], F_GETFL, 0);
+    if (ret == -1)
+    {
+      Error << "fcntl(F_GETFL) " << strerror(ret);
+      throw strerror(ret);
+    }
+
+    ret= fcntl(_fd[0], F_SETFL, ret | O_NONBLOCK);
+    if (ret == -1)
+    {
+      Error << "fcntl(F_SETFL) " << strerror(ret);
+      throw strerror(ret);
+    }
   }
+}
 
-  return true;
+Application::Pipe::~Pipe()
+{
+  close(READ);
+  close(WRITE);
 }
+
+void Application::Pipe::dup_for_spawn(const close_t& arg, posix_spawn_file_actions_t& file_actions, const int newfildes)
+{
+  int type= int(arg);
+
+  int ret;
+  if ((ret= posix_spawn_file_actions_adddup2(&file_actions, _fd[type], newfildes )) < 0)
+  {
+    Error << "posix_spawn_file_actions_adddup2(" << strerror(ret) << ")";
+    throw strerror(ret);
+  }
+
+  if ((ret= posix_spawn_file_actions_addclose(&file_actions, _fd[type])) < 0)
+  {
+    Error << "posix_spawn_file_actions_adddup2(" << strerror(ret) << ")";
+    throw strerror(ret);
+  }
+}
+
+void Application::Pipe::close(const close_t& arg)
+{
+  int type= int(arg);
+
+  if (_open[type])
+  {
+    int ret;
+    if ((ret= ::close(_fd[type])) < 0)
+    {
+      Error << "close(" << strerror(ret) << ")";
+    }
+    _open[type]= false;
+  }
+}
+
+void Application::create_argv(const char *args[])
+{
+  _argc= 2 +_use_libtool ? 2 : 0; // +1 for the command, +2 for libtool/mode=execute, +1 for the NULL
+
+  if (_use_libtool)
+  {
+    _argc+= 2; // +2 for libtool --mode=execute
+  }
+
+  for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++)
+  {
+    _argc++;
+    if ((*iter).second.empty() == false)
+    {
+      _argc++;
+    }
+  }
+
+  if (args)
+  {
+    for (const char **ptr= args; *ptr; ++ptr)
+    {
+      _argc++;
+    }
+  }
+
+  delete_argv();
+  built_argv= new char * [_argc];
+
+  size_t x= 0;
+  if (_use_libtool)
+  {
+    assert(libtool());
+    built_argv[x++]= strdup(libtool());
+    built_argv[x++]= strdup("--mode=execute");
+  }
+  built_argv[x++]= strdup(_exectuble_with_path.c_str());
+
+  for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++)
+  {
+    built_argv[x++]= strdup((*iter).first.c_str());
+    if ((*iter).second.empty() == false)
+    {
+      built_argv[x++]= strdup((*iter).second.c_str());
+    }
+  }
+
+  if (args)
+  {
+    for (const char **ptr= args; *ptr; ++ptr)
+    {
+      built_argv[x++]= strdup(*ptr);
+    }
+  }
+  built_argv[_argc -1]= NULL;
+}
+
+std::string Application::print()
+{
+  return print_argv(built_argv, _argc, _pid);
+}
+
+void Application::delete_argv()
+{
+  if (built_argv == NULL)
+  {
+    return;
+  }
+
+  for (size_t x= 0; x < _argc; x++)
+  {
+    if (built_argv[x])
+    {
+      ::free(built_argv[x]);
+    }
+  }
+  delete[] built_argv;
+  built_argv= NULL;
+  _argc= 0;
+}
+
+
+int exec_cmdline(const std::string& command, const char *args[], bool use_libtool)
+{
+  Application app(command, use_libtool);
+
+  Application::error_t ret= app.run(args);
+
+  if (ret != Application::SUCCESS)
+  {
+    return int(ret);
+  }
+
+  return int(app.wait());
+}
+
+const char *gearmand_binary() 
+{
+  return GEARMAND_BINARY;
+}
+
+} // namespace exec_cmdline