*/
+#include <config.h>
#include <libtest/common.h>
#include <cassert>
#include <libtest/stream.h>
#include <libtest/killpid.h>
-#ifdef HAVE_LIBGEARMAN
-#include <libtest/gearmand.h>
-#include <libtest/blobslap_worker.h>
-#endif
-
-#ifdef HAVE_LIBMEMCACHED
-#include <libtest/memcached.h>
-#endif
-
namespace libtest {
std::ostream& operator<<(std::ostream& output, const Server &arg)
output << " Socket:" << arg.socket();
}
- if (not arg.running().empty())
+ if (arg.running().empty() == false)
{
output << " Exec:" << arg.running();
}
-
return output; // for multiple << operators
}
-void Server::nap(void)
-{
-#ifdef WIN32
- sleep(1);
-#else
- struct timespec global_sleep_value= { 0, 50000 };
- nanosleep(&global_sleep_value, NULL);
-#endif
-}
+#define MAGIC_MEMORY 123570
Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) :
+ _magic(MAGIC_MEMORY),
_is_socket(is_socket_arg),
_pid(-1),
_port(port_arg),
}
}
-std::string server_startup_st::option_string() const
+bool Server::validate()
{
- std::string temp= server_list;
- rtrim(temp);
- return temp;
+ return _magic == MAGIC_MEMORY;
}
// If the server exists, kill it
// Try to ping, and kill the server #limit number of times
pid_t current_pid;
- while (--limit and (current_pid= get_pid()) != -1)
+ while (--limit and
+ is_pid_valid(current_pid= get_pid()))
{
if (kill(current_pid))
{
Log << "Killed existing server," << *this << " with pid:" << current_pid;
- nap();
+ dream(0, 50000);
continue;
}
}
return true;
}
-// Grab a one off command
-bool Server::command(std::string& command_arg)
+bool Server::wait_for_pidfile() const
{
- rebuild_base_command();
-
- command_arg+= _base_command;
+ Wait wait(pid_file(), 4);
- if (args(command_arg))
- {
- return true;
- }
-
- return false;
+ return wait.successful();
}
bool Server::start()
{
// If we find that we already have a pid then kill it.
- if (has_pid() and not kill(_pid))
+ if (has_pid() and kill(_pid) == false)
{
Error << "Could not kill() existing server during start() pid:" << _pid;
return false;
}
- assert(not has_pid());
- _running.clear();
- if (not command(_running))
+ if (has_pid() == false)
+ {
+ fatal_message("has_pid() failed, programer error");
+ }
+
+ Application app(executable(), is_libtool());
+
+ if (is_debug())
+ {
+ app.use_gdb();
+ }
+ else if (getenv("TESTS_ENVIRONMENT"))
+ {
+ if (strstr(getenv("TESTS_ENVIRONMENT"), "gdb"))
+ {
+ app.use_gdb();
+ }
+ }
+
+ if (args(app) == false)
{
Error << "Could not build command()";
return false;
}
- if (is_valgrind() or is_helgrind())
+ Application::error_t ret;
+ if (Application::SUCCESS != (ret= app.run()))
{
- _running+= " &";
+ Error << "Application::run() " << ret;
+ return false;
}
+ _running= app.print();
- if (system(_running.c_str()) == -1)
+ if (Application::SUCCESS != (ret= app.wait()))
{
- Error << "system() failed:" << strerror(errno);
- _running.clear();
+ Error << "Application::wait() " << _running << " " << ret;
return false;
}
- if (is_helgrind())
+ if (is_helgrind() or is_valgrind())
{
- sleep(4);
+ dream(5, 50000);
}
- if (pid_file_option() and not pid_file().empty())
+ if (pid_file().empty() == false)
{
- Wait wait(pid_file());
+ Wait wait(pid_file(), 8);
- if (not wait.successful())
+ if (wait.successful() == false)
{
- Error << "Unable to open pidfile: " << pid_file();
+ libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ "Unable to open pidfile for: %s",
+ _running.c_str());
}
}
- int count= is_helgrind() ? 20 : 5;
- while (not ping() and --count)
+ int counter= 0;
+ bool pinged= false;
+ while ((pinged= ping()) == false and
+ counter < (is_helgrind() or is_valgrind() ? 20 : 5))
{
- nap();
+ dream(counter++, 50000);
}
- if (count == 0)
+ if (pinged == false)
{
- Error << "Failed to ping() server once started:" << *this;
+ // If we happen to have a pid file, lets try to kill it
+ if (pid_file().empty() == false)
+ {
+ if (kill_file(pid_file()) == false)
+ {
+ fatal_message("Failed to kill off server after startup occurred, when pinging failed");
+ }
+ Error << "Failed to ping() server started, having pid_file. exec:" << _running;
+ }
+ else
+ {
+ Error << "Failed to ping() server started. exec:" << _running;
+ }
_running.clear();
return false;
}
return _pid;
}
+void Server::add_option(const std::string& arg)
+{
+ _options.push_back(std::make_pair(arg, std::string()));
+}
+
+void Server::add_option(const std::string& name, const std::string& value)
+{
+ _options.push_back(std::make_pair(name, value));
+}
+
bool Server::set_socket_file()
{
char file_buffer[FILENAME_MAX];
}
else
{
- snprintf(file_buffer, sizeof(file_buffer), "tests/var/run/%s.socketXXXXXX", name());
+ snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name());
}
int fd;
}
else
{
- snprintf(file_buffer, sizeof(file_buffer), "tests/var/run/%s.pidXXXXXX", name());
+ snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name());
}
int fd;
char file_buffer[FILENAME_MAX];
file_buffer[0]= 0;
- snprintf(file_buffer, sizeof(file_buffer), "tests/var/log/%s.logXXXXXX", name());
+ snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name());
int fd;
if ((fd= mkstemp(file_buffer)) == -1)
{
- perror(file_buffer);
- return false;
+ libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
}
close(fd);
return true;
}
-void Server::rebuild_base_command()
+bool Server::args(Application& app)
{
- _base_command.clear();
- if (is_libtool() and getenv("LIBTOOL_COMMAND"))
- {
- _base_command+= getenv("LIBTOOL_COMMAND");
- _base_command+= " ";
- }
- if (is_debug() and getenv("GDB_COMMAND"))
- {
- _base_command+= getenv("GDB_COMMAND");
- _base_command+= " ";
- }
- else if (is_valgrind() and getenv("VALGRIND_COMMAND"))
- {
- _base_command+= getenv("VALGRIND_COMMAND");
- _base_command+= " ";
- }
- else if (is_helgrind() and getenv("HELGRIND_COMMAND"))
+ // Set a log file if it was requested (and we can)
+ if (has_log_file_option())
{
- _base_command+= getenv("HELGRIND_COMMAND");
- _base_command+= " ";
+ set_log_file();
+ log_file_option(app, _log_file);
}
- _base_command+= executable();
-}
-
-void Server::set_extra_args(const std::string &arg)
-{
- _extra_args= arg;
-}
-
-bool Server::args(std::string& options)
-{
- std::stringstream arg_buffer;
-
- // Set a log file if it was requested (and we can)
- if (getenv("LIBTEST_LOG") and log_file_option())
+ if (getenv("LIBTEST_SYSLOG") and has_syslog())
{
- if (not set_log_file())
- {
- return false;
- }
-
- arg_buffer << " " << log_file_option() << _log_file;
+ app.add_option("--syslog");
}
// Update pid_file
- if (pid_file_option())
{
- if (not set_pid_file())
+ if (_pid_file.empty() and set_pid_file() == false)
{
return false;
}
- arg_buffer << " " << pid_file_option() << pid_file();
+ pid_file_option(app, pid_file());
}
assert(daemon_file_option());
if (daemon_file_option() and not is_valgrind() and not is_helgrind())
{
- arg_buffer << " " << daemon_file_option();
+ app.add_option(daemon_file_option());
}
- if (_is_socket and socket_file_option())
+ if (has_socket_file_option())
{
- if (not set_socket_file())
+ if (set_socket_file() == false)
{
return false;
}
- arg_buffer << " " << socket_file_option() << "\"" << _socket << "\"";
+ socket_file_option(app, _socket);
}
- assert(port_option());
- if (port_option() and _port > 0)
+ if (has_port_option())
{
- arg_buffer << " " << port_option() << _port;
+ port_option(app, _port);
}
- options+= arg_buffer.str();
-
- if (not _extra_args.empty())
+ for (Options::const_iterator iter= _options.begin(); iter != _options.end(); iter++)
{
- options+= _extra_args;
+ if ((*iter).second.empty() == false)
+ {
+ app.add_option((*iter).first, (*iter).second);
+ }
+ else
+ {
+ app.add_option((*iter).first);
+ }
}
return true;
{
if (check_pid(pid_arg) and kill_pid(pid_arg)) // If we kill it, reset
{
- if (broken_pid_file() and not pid_file().empty())
+ if (broken_pid_file() and pid_file().empty() == false)
{
unlink(pid_file().c_str());
}
- reset_pid();
-
- return true;
- }
-
- return false;
-}
-
-void server_startup_st::push_server(Server *arg)
-{
- servers.push_back(arg);
-
- char port_str[NI_MAXSERV];
- snprintf(port_str, sizeof(port_str), "%u", int(arg->port()));
-
- std::string server_config_string;
- if (arg->has_socket())
- {
- server_config_string+= "--socket=";
- server_config_string+= '"';
- server_config_string+= arg->socket();
- server_config_string+= '"';
- server_config_string+= " ";
- }
- else
- {
- server_config_string+= "--server=";
- server_config_string+= arg->hostname();
- server_config_string+= ":";
- server_config_string+= port_str;
- server_config_string+= " ";
- }
-
- server_list+= server_config_string;
-
-}
-
-Server* server_startup_st::pop_server()
-{
- Server *tmp= servers.back();
- servers.pop_back();
- return tmp;
-}
-
-void server_startup_st::shutdown(bool remove)
-{
- if (remove)
- {
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
- {
- delete *iter;
- }
- servers.clear();
- }
- else
- {
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
- {
- if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid()))
- {
- Error << "Unable to kill:" << *(*iter);
- }
- }
- }
-}
-
-server_startup_st::~server_startup_st()
-{
- shutdown(true);
-}
-
-bool server_startup_st::is_debug() const
-{
- return bool(getenv("LIBTEST_MANUAL_GDB"));
-}
-
-bool server_startup_st::is_valgrind() const
-{
- return bool(getenv("LIBTEST_MANUAL_VALGRIND"));
-}
-
-bool server_startup_st::is_helgrind() const
-{
- return bool(getenv("LIBTEST_MANUAL_HELGRIND"));
-}
-
-
-bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[])
-{
- Outn();
-
- // Look to see if we are being provided ports to use
- {
- char variable_buffer[1024];
- snprintf(variable_buffer, sizeof(variable_buffer), "LIBTEST_PORT_%lu", (unsigned long)construct.count());
-
- char *var;
- if ((var= getenv(variable_buffer)))
+ if (broken_socket_cleanup() and has_socket() and not socket().empty())
{
- in_port_t tmp= in_port_t(atoi(var));
-
- if (tmp > 0)
- try_port= tmp;
+ unlink(socket().c_str());
}
- }
-
- Server *server= NULL;
- if (0)
- { }
- else if (server_type.compare("gearmand") == 0)
- {
-#ifdef GEARMAND_BINARY
- #ifdef HAVE_LIBGEARMAN
- server= build_gearmand("localhost", try_port);
- #else
- Error << "Libgearman was not found";
- #endif
-#else
- Error << "No gearmand binary is available";
-#endif
- }
- else if (server_type.compare("blobslap_worker") == 0)
- {
-#ifdef GEARMAND_BINARY
- #ifdef HAVE_LIBGEARMAN
- server= build_blobslap_worker(try_port);
- #else
- Error << "Libgearman was not found";
- #endif
-#else
- Error << "No gearmand binary is available";
-#endif
- }
- else if (server_type.compare("memcached") == 0)
- {
-#ifdef MEMCACHED_BINARY
-#ifdef HAVE_LIBMEMCACHED
- server= build_memcached("localhost", try_port);
-#else
- Error << "Libmemcached was not found";
-#endif
-#else
- Error << "No memcached binary is available";
-#endif
- }
- else
- {
- Error << "Failed to start " << server_type << ", no support was found to be compiled in for it.";
- }
-
- if (server == NULL)
- {
- Error << "Failure occured while creating server: " << server_type;
- return false;
- }
-
- /*
- We will now cycle the server we have created.
- */
- if (not server->cycle())
- {
- Error << "Could not start up server " << *server;
- delete server;
- return false;
- }
-
- server->build(argc, argv);
-
- if (construct.is_debug())
- {
- Out << "Pausing for startup, hit return when ready.";
- std::string gdb_command= server->base_command();
- std::string options;
- Out << "run " << server->args(options);
- getchar();
- }
- else if (not server->start())
- {
- Error << "Failed to start " << *server;
- delete server;
- return false;
- }
- else
- {
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- }
-
- construct.push_server(server);
-
- if (default_port() == 0)
- {
- assert(server->has_port());
- set_default_port(server->port());
- }
-
- Outn();
-
- return true;
-}
-
-bool server_startup_st::start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[])
-{
- (void)try_port;
- Outn();
-
- Server *server= NULL;
- if (0)
- { }
- else if (server_type.compare("gearmand") == 0)
- {
- Error << "Socket files are not supported for gearmand yet";
- }
- else if (server_type.compare("memcached") == 0)
- {
-#ifdef MEMCACHED_BINARY
-#ifdef HAVE_LIBMEMCACHED
- server= build_memcached_socket("localhost", try_port);
-#else
- Error << "Libmemcached was not found";
-#endif
-#else
- Error << "No memcached binary is available";
-#endif
- }
- else
- {
- Error << "Failed to start " << server_type << ", no support was found to be compiled in for it.";
- }
- if (server == NULL)
- {
- Error << "Failure occured while creating server: " << server_type;
- return false;
- }
-
- /*
- We will now cycle the server we have created.
- */
- if (not server->cycle())
- {
- Error << "Could not start up server " << *server;
- delete server;
- return false;
- }
-
- server->build(argc, argv);
+ reset_pid();
- if (is_debug())
- {
- Out << "Pausing for startup, hit return when ready.";
- std::string gdb_command= server->base_command();
- std::string options;
- Out << "run " << server->args(options);
- getchar();
- }
- else if (not server->start())
- {
- Error << "Failed to start " << *server;
- delete server;
- return false;
- }
- else
- {
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ return true;
}
- push_server(server);
-
- set_default_socket(server->socket().c_str());
-
- Outn();
-
- return true;
+ return false;
}
} // namespace libtest