*/
+#include <config.h>
#include <libtest/common.h>
#include <cassert>
output << " Socket:" << arg.socket();
}
- if (not arg.running().empty())
+ if (arg.running().empty() == false)
{
output << " Exec:" << arg.running();
}
return output; // for multiple << operators
}
-Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) :
+#define MAGIC_MEMORY 123570
+
+Server::Server(const std::string& host_arg, const in_port_t port_arg,
+ const std::string& executable, const bool _is_libtool,
+ bool is_socket_arg) :
+ _magic(MAGIC_MEMORY),
_is_socket(is_socket_arg),
_pid(-1),
_port(port_arg),
- _hostname(host_arg)
+ _hostname(host_arg),
+ _app(executable, _is_libtool)
{
}
Server::~Server()
{
- if (has_pid() and not kill(_pid))
- {
- Error << "Unable to kill:" << *this;
- }
+}
+
+bool Server::check()
+{
+ _app.slurp();
+ return _app.check();
+}
+
+bool Server::validate()
+{
+ return _magic == MAGIC_MEMORY;
}
// If the server exists, kill it
uint32_t limit= 3;
// Try to ping, and kill the server #limit number of times
- pid_t current_pid;
- while (--limit and is_pid_valid(current_pid= get_pid()))
+ while (--limit and
+ is_pid_valid(_app.pid()))
{
- if (kill(current_pid))
+ if (kill())
{
- Log << "Killed existing server," << *this << " with pid:" << current_pid;
+ Log << "Killed existing server," << *this;
dream(0, 50000);
continue;
}
// For whatever reason we could not kill it, and we reached limit
if (limit == 0)
{
- Error << "Reached limit, could not kill server pid:" << current_pid;
+ Error << "Reached limit, could not kill server";
return false;
}
return wait.successful();
}
+bool Server::has_pid() const
+{
+ return (_pid > 1);
+}
+
+
bool Server::start()
{
// If we find that we already have a pid then kill it.
- if (has_pid() and kill(_pid) == false)
+ if (has_pid() == false)
{
- Error << "Could not kill() existing server during start() pid:" << _pid;
- return false;
+ fatal_message("has_pid() failed, programer error");
}
- if (has_pid() == false)
+ // This needs more work.
+#if 0
+ if (gdb_is_caller())
{
- fatal_message("has_pid() failed, programer error");
+ _app.use_gdb();
}
+#endif
- Application app(executable(), is_libtool());
- if (args(app) == false)
+ if (args(_app) == false)
{
Error << "Could not build command()";
return false;
}
Application::error_t ret;
- if (Application::SUCCESS != (ret= app.run()))
+ if (Application::SUCCESS != (ret= _app.run()))
{
Error << "Application::run() " << ret;
return false;
}
- _running= app.print();
+ _running= _app.print();
- if (Application::SUCCESS != (ret= app.wait()))
- {
- Error << "Application::wait() " << app.print() << " " << ret;
- return false;
- }
-
- if (is_helgrind() or is_valgrind())
+ if (valgrind_is_caller())
{
dream(5, 50000);
}
{
Wait wait(pid_file(), 8);
- if (not wait.successful())
+ if (wait.successful() == false)
{
- Error << "Unable to open pidfile for: " << _running;
+ libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ "Unable to open pidfile for: %s",
+ _running.c_str());
}
}
- int counter= 0;
+ uint32_t this_wait;
bool pinged= false;
- while ((pinged= ping()) == false and
- counter < (is_helgrind() or is_valgrind() ? 20 : 5))
{
- dream(counter++, 50000);
+ 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= 1; ; retry++, waited+= this_wait)
+ {
+ if ((pinged= ping()) == true)
+ {
+ break;
+ }
+ else if (waited >= timeout)
+ {
+ break;
+ }
+
+ this_wait= retry * retry / 3 + 1;
+ libtest::dream(this_wait, 0);
+ }
}
if (pinged == 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;
+ Error << "Failed to ping(), waited:" << this_wait
+ << " server started, having pid_file. exec:" << _running
+ << " error:" << _app.stderr_result();
}
else
{
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);
{
// Set a log file if it was requested (and we can)
- if (getenv("LIBTEST_LOG") and has_log_file_option())
+ if (has_log_file_option())
{
- if (not set_log_file())
- {
- return false;
- }
-
+ set_log_file();
log_file_option(app, _log_file);
}
pid_file_option(app, pid_file());
}
- assert(daemon_file_option());
- if (daemon_file_option() and not is_valgrind() and not is_helgrind())
- {
- app.add_option(daemon_file_option());
- }
-
if (has_socket_file_option())
{
if (set_socket_file() == false)
return true;
}
-bool Server::is_debug() const
-{
- return bool(getenv("LIBTEST_MANUAL_GDB"));
-}
-
-bool Server::is_valgrind() const
-{
- return bool(getenv("LIBTEST_MANUAL_VALGRIND"));
-}
-
-bool Server::is_helgrind() const
-{
- return bool(getenv("LIBTEST_MANUAL_HELGRIND"));
-}
-
-bool Server::kill(pid_t pid_arg)
+bool Server::kill()
{
- if (check_pid(pid_arg) and kill_pid(pid_arg)) // If we kill it, reset
+ if (check_pid(_app.pid()) and kill_pid(_app.pid())) // If we kill it, reset
{
if (broken_pid_file() and pid_file().empty() == false)
{
projects / m6w6 / libmemcached / blobdiff