X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.cc;h=d024d054ab02e4e6d1e284c7a601930f49f8238e;hb=91ea3455ccf0cebaecbb2c0ee4ead073b6d86354;hp=d58b362ed5c8927f3cbb9231b4590c667e2318b0;hpb=3893029e70c654f4fcf3bf8f8ba5b404afc6d446;p=awesomized%2Flibmemcached diff --git a/libtest/server.cc b/libtest/server.cc index d58b362e..d024d054 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -34,7 +34,8 @@ * */ -#include +#include "libtest/yatlcon.h" + #include #include @@ -97,7 +98,7 @@ class Buffer { public: Buffer(char *b) : b_(b) {} - ~Buffer() { free(b_); } + ~Buffer() { if (b_) free(b_); } char* buf() { return b_; } private: char *b_; @@ -116,7 +117,8 @@ Server::Server(const std::string& host_arg, const in_port_t port_arg, _port(port_arg), _hostname(host_arg), _app(executable, _is_libtool), - out_of_ban_killed_(false) + out_of_ban_killed_(false), + _timeout(40) { } @@ -171,6 +173,22 @@ bool Server::wait_for_pidfile() const return wait.successful(); } +bool Server::init(const char *argv[]) +{ + if (argv) + { + for (const char **ptr= argv; *ptr ; ++ptr) + { + if (ptr) + { + add_option(*ptr); + } + } + } + + return build(); +} + bool Server::has_pid() const { return (_app.pid() > 1); @@ -187,13 +205,10 @@ bool Server::start() #endif } - // This needs more work. -#if 0 - if (gdb_is_caller()) + if (getenv("YATL_GDB_SERVER")) { - _app.use_gdb(); + _app.use_gdb(true); } -#endif if (port() == LIBTEST_FAIL_PORT) { @@ -203,13 +218,14 @@ bool Server::start() if (getenv("YATL_PTRCHECK_SERVER")) { - _app.use_ptrcheck(); + _app.use_ptrcheck(true); } else if (getenv("YATL_VALGRIND_SERVER")) { - _app.use_valgrind(); + _app.use_valgrind(true); } + out_of_ban_killed(false); if (args(_app) == false) { throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, @@ -252,8 +268,9 @@ bool Server::start() Buffer buf( get_current_dir_name()); char *getcwd_buf= buf.buf(); #else - char buf[PATH_MAX]; - char *getcwd_buf= getcwd(buf, sizeof(buf)); + libtest::vchar_t buf; + buf.resize(PATH_MAX); + char *getcwd_buf= getcwd(&buf[0], buf.size()); #endif // __GLIBC__ throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, hostname(), port(), @@ -268,11 +285,10 @@ bool Server::start() bool pinged= false; 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= 7; ; retry++, waited+= this_wait) + for (waited= 0, retry= 1; ; retry++, waited+= this_wait) { if (_app.check() == false) { @@ -283,13 +299,11 @@ bool Server::start() { break; } - else if (waited >= timeout) + else if (waited >= _timeout) { break; } - Error << "ping(" << _app.pid() << ") wait: " << this_wait << " " << hostname() << ":" << port() << " " << error(); - this_wait= retry * retry / 3 + 1; libtest::dream(this_wait, 0); } @@ -297,6 +311,10 @@ bool Server::start() if (pinged == false) { +#if 0 + Error << "Failed to ping(" << _app.pid() << ") wait: " << this_wait << " " << hostname() << ":" << port() << " run:" << _running << " " << error(); +#endif + // 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)) { @@ -364,73 +382,76 @@ void Server::add_option(const std::string& name_, const std::string& value_) bool Server::set_socket_file() { - char file_buffer[FILENAME_MAX]; + libtest::vchar_t file_buffer; + file_buffer.resize(FILENAME_MAX); file_buffer[0]= 0; if (broken_pid_file()) { - snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.socketXXXXXX", name()); + snprintf(&file_buffer[0], file_buffer.size(), "/tmp/%s.socketXXXXXX", name()); } else { - snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name()); + snprintf(&file_buffer[0], file_buffer.size(), "var/run/%s.socketXXXXXX", name()); } int fd; - if ((fd= mkstemp(file_buffer)) == -1) + if ((fd= mkstemp(&file_buffer[0])) == -1) { - perror(file_buffer); + perror(&file_buffer[0]); return false; } close(fd); - unlink(file_buffer); + unlink(&file_buffer[0]); - _socket= file_buffer; + _socket= &file_buffer[0]; return true; } bool Server::set_pid_file() { - char file_buffer[FILENAME_MAX]; + libtest::vchar_t file_buffer; + file_buffer.resize(FILENAME_MAX); file_buffer[0]= 0; if (broken_pid_file()) { - snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.pidXXXXXX", name()); + snprintf(&file_buffer[0], file_buffer.size(), "/tmp/%s.pidXXXXXX", name()); } else { - snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name()); + snprintf(&file_buffer[0], file_buffer.size(), "var/run/%s.pidXXXXXX", name()); } int fd; - if ((fd= mkstemp(file_buffer)) == -1) + if ((fd= mkstemp(&file_buffer[0])) == -1) { - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", &file_buffer[0], strerror(errno)); } close(fd); - unlink(file_buffer); + unlink(&file_buffer[0]); - _pid_file= file_buffer; + _pid_file= &file_buffer[0]; return true; } bool Server::set_log_file() { - char file_buffer[FILENAME_MAX]; + libtest::vchar_t file_buffer; + file_buffer.resize(FILENAME_MAX); file_buffer[0]= 0; - snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name()); + snprintf(&file_buffer[0], file_buffer.size(), "var/log/%s.logXXXXXX", name()); int fd; - if ((fd= mkstemp(file_buffer)) == -1) + if ((fd= mkstemp(&file_buffer[0])) == -1) { - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno)); + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", &file_buffer[0], strerror(errno)); } close(fd); - _log_file= file_buffer; + _log_file= &file_buffer[0]; return true; } @@ -477,13 +498,16 @@ bool Server::args(Application& app) for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter) { - if ((*iter).second.empty() == false) - { - app.add_option((*iter).first, (*iter).second); - } - else + if ((*iter).first.empty() == false) { - app.add_option((*iter).first); + if ((*iter).second.empty() == false) + { + app.add_option((*iter).first, (*iter).second); + } + else + { + app.add_option((*iter).first); + } } }