+ bool data_was_read= false;
+ if (fds[0].revents & POLLRDNORM)
+ {
+ if (stdout_fd.read(_stdout_buffer) == true)
+ {
+ data_was_read= true;
+ }
+ }
+
+ if (fds[1].revents & POLLRDNORM)
+ {
+ if (stderr_fd.read(_stderr_buffer) == true)
+ {
+ data_was_read= true;
+ }
+ }
+
+ return data_was_read;
+}
+
+Application::error_t Application::join()
+{
+ pid_t waited_pid= waitpid(_pid, &_status, 0);
+
+ if (waited_pid == _pid and WIFEXITED(_status) == false)
+ {
+ /*
+ What we are looking for here is how the exit status happened.
+ - 127 means that posix_spawn() itself had an error.
+ - If WEXITSTATUS is positive we need to see if it is a signal that we sent to kill the process. If not something bad happened in the process itself.
+ - Finally something has happened that we don't currently understand.
+ */
+ if (WEXITSTATUS(_status) == 127)
+ {
+ _app_exit_state= Application::INVALID_POSIX_SPAWN;
+ std::string error_string("posix_spawn() failed pid:");
+ error_string+= _pid;
+ error_string+= " name:";
+ error_string+= built_argv[0];
+ throw std::logic_error(error_string);
+ }
+ else if WIFSIGNALED(_status)
+ {
+ if (WTERMSIG(_status) != SIGTERM)
+ {
+ _app_exit_state= Application::INVALID_POSIX_SPAWN;
+ std::string error_string(built_argv[0]);
+ error_string+= " was killed by signal ";
+ error_string+= strsignal(WTERMSIG(_status));
+ throw std::runtime_error(error_string);
+ }
+
+ _app_exit_state= Application::SIGTERM_KILLED;
+ Error << "waitpid() application terminated at request"
+ << " pid:" << _pid
+ << " name:" << built_argv[0];
+ }
+ else
+ {
+ _app_exit_state= Application::UNKNOWN;
+ Error << "Unknown logic state at exit:" << WEXITSTATUS(_status)
+ << " pid:" << _pid
+ << " name:" << built_argv[0];
+ }
+ }
+ else if (waited_pid == _pid and WIFEXITED(_status))
+ {
+ _app_exit_state= int_to_error_t(WEXITSTATUS(_status));
+ }
+ else if (waited_pid == -1)
+ {
+ _app_exit_state= Application::UNKNOWN;
+ Error << "waitpid() returned errno:" << strerror(errno);
+ }
+ else
+ {
+ _app_exit_state= Application::UNKNOWN;
+ throw std::logic_error("waitpid() returned an unknown value");
+ }
+
+ return _app_exit_state;
+}
+
+void Application::add_long_option(const std::string& name, const std::string& option_value)
+{
+ std::string arg(name);
+ arg+= option_value;
+ _options.push_back(std::make_pair(arg, std::string()));
+}
+
+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(int arg) :
+ _std_fd(arg)
+{
+ _pipe_fd[READ]= -1;
+ _pipe_fd[WRITE]= -1;
+ _open[READ]= false;
+ _open[WRITE]= false;
+}
+
+int Application::Pipe::Pipe::fd()
+{
+ if (_std_fd == STDOUT_FILENO)
+ {
+ return _pipe_fd[READ];
+ }
+ else if (_std_fd == STDERR_FILENO)
+ {
+ return _pipe_fd[READ];
+ }
+
+ return _pipe_fd[WRITE]; // STDIN_FILENO
+}
+
+
+bool Application::Pipe::read(libtest::vchar_t& arg)
+{
+ fatal_assert(_std_fd == STDOUT_FILENO or _std_fd == STDERR_FILENO);
+
+ bool data_was_read= false;
+
+ ssize_t read_length;
+ char buffer[1024]= { 0 };
+ while ((read_length= ::read(_pipe_fd[READ], buffer, sizeof(buffer))))
+ {
+ if (read_length == -1)
+ {
+ switch(errno)
+ {
+ case EAGAIN:
+ break;
+
+ default:
+ Error << strerror(errno);
+ break;
+ }
+
+ break;
+ }
+
+ data_was_read= true;
+ arg.reserve(read_length +1);
+ for (size_t x= 0; x < size_t(read_length); ++x)
+ {
+ arg.push_back(buffer[x]);
+ }
+ // @todo Suck up all errput code here
+ }
+
+ return data_was_read;
+}
+
+void Application::Pipe::nonblock()
+{
+ int flags;
+ {
+ flags= fcntl(_pipe_fd[READ], F_GETFL, 0);
+ } while (flags == -1 and (errno == EINTR or errno == EAGAIN));
+
+ if (flags == -1)
+ {
+ Error << "fcntl(F_GETFL) " << strerror(errno);
+ throw strerror(errno);
+ }
+
+ int rval;
+ do
+ {
+ rval= fcntl(_pipe_fd[READ], F_SETFL, flags | O_NONBLOCK);
+ } while (rval == -1 and (errno == EINTR or errno == EAGAIN));
+
+ if (rval == -1)
+ {
+ Error << "fcntl(F_SETFL) " << strerror(errno);
+ throw strerror(errno);
+ }
+}
+
+void Application::Pipe::reset()
+{
+ close(READ);
+ close(WRITE);
+
+#if defined(HAVE_PIPE2) && HAVE_PIPE2
+ if (pipe2(_pipe_fd, O_NONBLOCK|O_CLOEXEC) == -1)
+#else
+ if (pipe(_pipe_fd) == -1)
+#endif
+ {
+ fatal_message(strerror(errno));
+ }
+ _open[0]= true;
+ _open[1]= true;
+
+#if defined(HAVE_PIPE2) && HAVE_PIPE2
+ {
+ nonblock();
+ cloexec();
+ }
+#endif
+}
+
+void Application::Pipe::cloexec()
+{
+ //if (SOCK_CLOEXEC == 0)
+ {
+ if (FD_CLOEXEC)
+ {
+ int flags;
+ do
+ {
+ flags= fcntl(_pipe_fd[WRITE], F_GETFD, 0);
+ } while (flags == -1 and (errno == EINTR or errno == EAGAIN));
+
+ if (flags == -1)
+ {
+ Error << "fcntl(F_GETFD) " << strerror(errno);
+ throw strerror(errno);
+ }
+
+ int rval;
+ do
+ {
+ rval= fcntl(_pipe_fd[WRITE], F_SETFD, flags | FD_CLOEXEC);
+ } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
+
+ if (rval == -1)
+ {
+ Error << "fcntl(F_SETFD) " << strerror(errno);
+ throw strerror(errno);
+ }
+ }
+ }
+}
+
+Application::Pipe::~Pipe()
+{
+ if (_pipe_fd[0] != -1)
+ {
+ ::close(_pipe_fd[0]);
+ }
+
+ if (_pipe_fd[1] != -1)
+ {
+ ::close(_pipe_fd[1]);
+ }
+}
+
+void Application::Pipe::dup_for_spawn(posix_spawn_file_actions_t& file_actions)
+{
+ int type= STDIN_FILENO == _std_fd ? 0 : 1;
+
+ int ret;
+ if ((ret= posix_spawn_file_actions_adddup2(&file_actions, _pipe_fd[type], _std_fd )) < 0)
+ {
+ Error << "posix_spawn_file_actions_adddup2(" << strerror(ret) << ")";
+ fatal_message(strerror(ret));
+ }
+
+ if ((ret= posix_spawn_file_actions_addclose(&file_actions, _pipe_fd[type])) < 0)
+ {
+ Error << "posix_spawn_file_actions_adddup2(" << strerror(ret) << ")";
+ fatal_message(strerror(ret));
+ }
+}
+
+void Application::Pipe::close(const close_t& arg)
+{
+ int type= int(arg);
+
+ if (_open[type])
+ {
+ if (::close(_pipe_fd[type]) == -1)
+ {
+ Error << "close(" << strerror(errno) << ")";
+ }
+ _open[type]= false;
+ _pipe_fd[type]= -1;
+ }
+}
+
+void Application::create_argv(const char *args[])
+{
+ delete_argv();
+ if (_use_libtool)
+ {
+ assert(libtool());
+ built_argv.push_back(strdup(libtool()));
+ built_argv.push_back(strdup("--mode=execute"));
+ }
+
+ if (_use_valgrind)
+ {
+ /*
+ valgrind --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+ */
+ built_argv.push_back(strdup("valgrind"));
+ built_argv.push_back(strdup("--error-exitcode=1"));
+ built_argv.push_back(strdup("--leak-check=yes"));
+#if 0
+ built_argv.push_back(strdup("--show-reachable=yes"));
+#endif
+ built_argv.push_back(strdup("--track-fds=yes"));
+#if 0
+ built_argv[x++]= strdup("--track-origin=yes");
+#endif
+ built_argv.push_back(strdup("--malloc-fill=A5"));
+ built_argv.push_back(strdup("--free-fill=DE"));
+
+ std::string log_file= create_tmpfile("valgrind");
+ char buffer[1024];
+ int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str());
+ fatal_assert(length > 0 and size_t(length) < sizeof(buffer));
+ built_argv.push_back(strdup(buffer));
+ }
+ else if (_use_ptrcheck)
+ {
+ /*
+ valgrind --error-exitcode=1 --tool=exp-ptrcheck --log-file=
+ */
+ built_argv.push_back(strdup("valgrind"));
+ built_argv.push_back(strdup("--error-exitcode=1"));
+ built_argv.push_back(strdup("--tool=exp-ptrcheck"));
+ std::string log_file= create_tmpfile("ptrcheck");
+ char buffer[1024];
+ int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str());
+ fatal_assert(length > 0 and size_t(length) < sizeof(buffer));
+ built_argv.push_back(strdup(buffer));
+ }
+ else if (_use_gdb)
+ {
+ built_argv.push_back(strdup("gdb"));
+ }
+
+ built_argv.push_back(strdup(_exectuble_with_path.c_str()));
+
+ for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter)
+ {
+ built_argv.push_back(strdup((*iter).first.c_str()));
+ if ((*iter).second.empty() == false)
+ {
+ built_argv.push_back(strdup((*iter).second.c_str()));
+ }
+ }
+
+ if (args)
+ {
+ for (const char **ptr= args; *ptr; ++ptr)
+ {
+ built_argv.push_back(strdup(*ptr));
+ }
+ }
+ built_argv.push_back(NULL);
+}
+
+std::string Application::print()
+{
+ return print_argv(built_argv);
+}
+
+std::string Application::arguments()
+{
+ std::stringstream arg_buffer;
+
+ for (size_t x= (1 +_use_libtool) ? 2 : 0;
+ x < _argc and built_argv[x];
+ ++x)
+ {
+ arg_buffer << built_argv[x] << " ";
+ }
+
+ return arg_buffer.str();
+}
+
+struct DeleteFromVector
+{
+ template <class T>
+ void operator() ( T* ptr) const
+ {
+ free(ptr);
+ }
+};
+
+void Application::delete_argv()
+{
+ std::for_each(built_argv.begin(), built_argv.end(), DeleteFromVector());
+
+ built_argv.clear();
+ _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.join());
+}
+
+const char *gearmand_binary()
+{
+ return GEARMAND_BINARY;
+}
+
+const char *drizzled_binary()
+{
+ return DRIZZLED_BINARY;