#include <libtest/stream.h>
#include <libtest/killpid.h>
-extern "C" {
- static bool exited_successfully(int status)
- {
- if (WEXITSTATUS(status) == 0)
- {
- return true;
- }
-
- return true;
- }
-}
-
-
namespace libtest {
std::ostream& operator<<(std::ostream& output, const Server &arg)
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
-}
-
Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) :
_is_socket(is_socket_arg),
_pid(-1),
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)
-{
- rebuild_base_command();
-
- command_arg+= _base_command;
-
- if (args(command_arg))
- {
- return true;
- }
-
- return false;
-}
-
bool Server::wait_for_pidfile() const
{
Wait wait(pid_file(), 4);
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(name(), is_libtool());
+ 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;
}
- int ret= system(_running.c_str());
- if (not exited_successfully(ret))
+ if (Application::SUCCESS != (ret= app.wait()))
{
- Error << "system() failed:" << strerror(errno);
- _running.clear();
+ Error << "Application::wait() " << ret;
return false;
}
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(), 8);
}
}
- int count= is_helgrind() or is_valgrind() ? 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)
{
// If we happen to have a pid file, lets try to kill it
- if (pid_file_option() and not pid_file().empty())
+ if (pid_file().empty() == false)
{
+ Error << "We are going to kill it off";
kill_file(pid_file());
}
Error << "Failed to ping() server started with:" << _running;
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];
return true;
}
-void Server::rebuild_base_command()
+bool Server::args(Application& app)
{
- _base_command.clear();
- if (is_libtool())
- {
- _base_command+= libtool();
- }
-
- 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"))
- {
- _base_command+= getenv("HELGRIND_COMMAND");
- _base_command+= " ";
- }
-
- _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_LOG") and has_log_file_option())
{
if (not set_log_file())
{
return false;
}
- arg_buffer << " " << log_file_option() << _log_file;
+ log_file_option(app, _log_file);
+ }
+
+ if (getenv("LIBTEST_SYSLOG") and has_syslog())
+ {
+ app.add_option("--syslog");
}
// Update pid_file
- if (pid_file_option())
{
- if (_pid_file.empty() and 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 (_is_socket and has_socket_file_option())
{
if (not set_socket_file())
{
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());
}
projects / m6w6 / libmemcached / blobdiff