X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.cc;h=f43b1c28b72ca970d679e0b274ca5faa7ddc7628;hb=acdfe4229a70c323e66c37e2768dfdea42694bb1;hp=6fc34031b95b319ce121b0a62fe54f8c14292a5f;hpb=3998b1125e1b9f8ebd2c963aa6f8d60131bc97c4;p=awesomized%2Flibmemcached diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc index 6fc34031..f43b1c28 100644 --- a/libtest/cmdline.cc +++ b/libtest/cmdline.cc @@ -1,22 +1,37 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -36,6 +51,13 @@ using namespace libtest; #include #include #include +#include + +#include + +#ifndef __USE_GNU +static char **environ= NULL; +#endif extern "C" { static int exited_successfully(int status) @@ -60,29 +82,34 @@ extern "C" { namespace { - std::string print_argv(char * * & built_argv, const size_t& argc) + std::string print_argv(libtest::vchar_ptr_t& built_argv) { std::stringstream arg_buffer; - for (size_t x= 0; x < argc; x++) + for (vchar_ptr_t::iterator iter= built_argv.begin(); + iter == built_argv.end(); + iter++) { - arg_buffer << built_argv[x] << " "; + arg_buffer << *iter << " "; } return arg_buffer.str(); } +#if 0 std::string print_argv(char** argv) { std::stringstream arg_buffer; - for (char** ptr= argv; *ptr; ptr++) + for (char** ptr= argv; *ptr; ++ptr) { arg_buffer << *ptr << " "; } return arg_buffer.str(); } +#endif + static Application::error_t int_to_error_t(int arg) { @@ -108,12 +135,12 @@ Application::Application(const std::string& arg, const bool _use_libtool_arg) : _use_valgrind(false), _use_gdb(false), _use_ptrcheck(false), + _will_fail(false), _argc(0), _exectuble(arg), stdin_fd(STDIN_FILENO), stdout_fd(STDOUT_FILENO), stderr_fd(STDERR_FILENO), - built_argv(NULL), _pid(-1) { if (_use_libtool) @@ -162,9 +189,9 @@ Application::error_t Application::run(const char *args[]) posix_spawn_file_actions_t file_actions; posix_spawn_file_actions_init(&file_actions); - stdin_fd.dup_for_spawn(Application::Pipe::READ, file_actions); - stdout_fd.dup_for_spawn(Application::Pipe::WRITE, file_actions); - stderr_fd.dup_for_spawn(Application::Pipe::WRITE, file_actions); + stdin_fd.dup_for_spawn(file_actions); + stdout_fd.dup_for_spawn(file_actions); + stderr_fd.dup_for_spawn(file_actions); posix_spawnattr_t spawnattr; posix_spawnattr_init(&spawnattr); @@ -228,13 +255,14 @@ Application::error_t Application::run(const char *args[]) } else { + if (_use_libtool) { - spawn_ret= posix_spawn(&_pid, built_argv[0], &file_actions, &spawnattr, built_argv, NULL); + spawn_ret= posix_spawn(&_pid, built_argv[0], &file_actions, &spawnattr, &built_argv[0], NULL); } else { - spawn_ret= posix_spawnp(&_pid, built_argv[0], &file_actions, &spawnattr, built_argv, NULL); + spawn_ret= posix_spawnp(&_pid, built_argv[0], &file_actions, &spawnattr, &built_argv[0], NULL); } } @@ -247,7 +275,10 @@ Application::error_t Application::run(const char *args[]) if (spawn_ret != 0) { - Error << strerror(spawn_ret) << "(" << spawn_ret << ")"; + if (_will_fail == false) + { + Error << strerror(spawn_ret) << "(" << spawn_ret << ")"; + } _pid= -1; return Application::INVALID; } @@ -428,12 +459,71 @@ Application::error_t Application::wait(bool nohang) if (exit_code == Application::INVALID) { Error << print_argv(built_argv, _argc); + / } #endif return exit_code; } +Application::error_t Application::join() +{ + if (_pid == -1) + { + return Application::INVALID; + } + + slurp(); + + error_t exit_code= FAILURE; + { + int status= 0; + pid_t waited_pid; + do { + waited_pid= waitpid(_pid, &status, 0); + } while (waited_pid == -1 and (errno == EINTR or errno == EAGAIN)); + + if (waited_pid == -1) + { + switch (errno) + { + case ECHILD: + exit_code= Application::SUCCESS; + break; + + case EINTR: + break; + + default: + Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(_pid); + break; + } + } + else if (waited_pid == 0) + { + exit_code= Application::SUCCESS; + } + 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)); + } + } + + slurp(); + + if (exit_code == Application::INVALID) + { + Error << print_argv(built_argv); + } +; + return exit_code; +} + void Application::add_long_option(const std::string& name, const std::string& option_value) { std::string arg(name); @@ -502,7 +592,7 @@ bool Application::Pipe::read(libtest::vchar_t& arg) data_was_read= true; arg.reserve(read_length +1); - for (size_t x= 0; x < read_length; x++) + for (size_t x= 0; x < size_t(read_length); ++x) { arg.push_back(buffer[x]); } @@ -533,7 +623,7 @@ void Application::Pipe::reset() close(READ); close(WRITE); -#if _GNU_SOURCE +#if HAVE_PIPE2 if (pipe2(_pipe_fd, O_NONBLOCK) == -1) #else if (pipe(_pipe_fd) == -1) @@ -569,13 +659,20 @@ void Application::Pipe::cloexec() Application::Pipe::~Pipe() { - close(READ); - close(WRITE); + if (_pipe_fd[0] != -1) + { + ::close(_pipe_fd[0]); + } + + if (_pipe_fd[1] != -1) + { + ::close(_pipe_fd[1]); + } } -void Application::Pipe::dup_for_spawn(const close_t& arg, posix_spawn_file_actions_t& file_actions) +void Application::Pipe::dup_for_spawn(posix_spawn_file_actions_t& file_actions) { - int type= int(arg); + 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) @@ -597,7 +694,6 @@ void Application::Pipe::close(const close_t& arg) if (_open[type]) { - int ret; if (::close(_pipe_fd[type]) == -1) { Error << "close(" << strerror(errno) << ")"; @@ -610,61 +706,11 @@ void Application::Pipe::close(const close_t& arg) void Application::create_argv(const char *args[]) { delete_argv(); - fatal_assert(_argc == 0); - - if (_use_libtool) - { - _argc+= 2; // +2 for libtool --mode=execute - } - - _argc+= 1; // For the command - - /* - valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --track-origin=yes --malloc-fill=A5 --free-fill=DE --log-file= - */ - if (_use_valgrind) - { - _argc+= 8; - } - else if (_use_ptrcheck) - { - /* - valgrind --error-exitcode=1 --tool=exp-ptrcheck --log-file= - */ - _argc+= 4; - } - else if (_use_gdb) // gdb - { - _argc+= 1; - } - - 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++; - } - } - - _argc+= 1; // for the NULL - - 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.push_back(strdup(libtool())); + built_argv.push_back(strdup("--mode=execute")); } if (_use_valgrind) @@ -672,51 +718,50 @@ void Application::create_argv(const char *args[]) /* valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE */ - built_argv[x++]= strdup("valgrind"); - built_argv[x++]= strdup("--error-exitcode=1"); - built_argv[x++]= strdup("--leak-check=yes"); - built_argv[x++]= strdup("--show-reachable=yes"); - built_argv[x++]= strdup("--track-fds=yes"); + built_argv.push_back(strdup("valgrind")); + built_argv.push_back(strdup("--error-exitcode=1")); + built_argv.push_back(strdup("--leak-check=yes")); + built_argv.push_back(strdup("--show-reachable=yes")); + built_argv.push_back(strdup("--track-fds=yes")); #if 0 built_argv[x++]= strdup("--track-origin=yes"); #endif - built_argv[x++]= strdup("--malloc-fill=A5"); - built_argv[x++]= strdup("--free-fill=DE"); + 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 length < sizeof(buffer)); - built_argv[x++]= strdup(buffer); + 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[x++]= strdup("valgrind"); - built_argv[x++]= strdup("--error-exitcode=1"); - built_argv[x++]= strdup("--tool=exp-ptrcheck"); - _argc+= 4; + 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 length < sizeof(buffer)); - built_argv[x++]= strdup(buffer); + fatal_assert(length > 0 and size_t(length) < sizeof(buffer)); + built_argv.push_back(strdup(buffer)); } else if (_use_gdb) { - built_argv[x++]= strdup("gdb"); + built_argv.push_back(strdup("gdb")); } - built_argv[x++]= strdup(_exectuble_with_path.c_str()); + built_argv.push_back(strdup(_exectuble_with_path.c_str())); - for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++) + for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter) { - built_argv[x++]= strdup((*iter).first.c_str()); + built_argv.push_back(strdup((*iter).first.c_str())); if ((*iter).second.empty() == false) { - built_argv[x++]= strdup((*iter).second.c_str()); + built_argv.push_back(strdup((*iter).second.c_str())); } } @@ -724,25 +769,24 @@ void Application::create_argv(const char *args[]) { for (const char **ptr= args; *ptr; ++ptr) { - built_argv[x++]= strdup(*ptr); + built_argv.push_back(strdup(*ptr)); } } - built_argv[x++]= NULL; - fatal_assert(x == _argc); + built_argv.push_back(NULL); } std::string Application::print() { - return print_argv(built_argv, _argc); + return print_argv(built_argv); } std::string Application::arguments() { std::stringstream arg_buffer; - for (size_t x= 1 + _use_libtool ? 2 : 0; + for (size_t x= (1 +_use_libtool) ? 2 : 0; x < _argc and built_argv[x]; - x++) + ++x) { arg_buffer << built_argv[x] << " "; } @@ -750,21 +794,21 @@ std::string Application::arguments() return arg_buffer.str(); } -void Application::delete_argv() +struct DeleteFromVector { - if (built_argv) - { - for (size_t x= 0; x < _argc; x++) + template + void operator() ( T* ptr) const { - if (built_argv[x]) - { - ::free(built_argv[x]); - } + free(ptr); } - delete[] built_argv; - built_argv= NULL; - _argc= 0; - } +}; + +void Application::delete_argv() +{ + std::for_each(built_argv.begin(), built_argv.end(), DeleteFromVector()); + + built_argv.clear(); + _argc= 0; } @@ -779,7 +823,7 @@ int exec_cmdline(const std::string& command, const char *args[], bool use_libtoo return int(ret); } - return int(app.wait(false)); + return int(app.join()); } const char *gearmand_binary() @@ -787,4 +831,9 @@ const char *gearmand_binary() return GEARMAND_BINARY; } +const char *drizzled_binary() +{ + return DRIZZLED_BINARY; +} + } // namespace exec_cmdline