+ int count= is_helgrind() or is_valgrind() ? 20 : 5;
+ while (not ping() and --count)
+ {
+ nap();
+ }
+
+ if (count == 0)
+ {
+ // If we happen to have a pid file, lets try to kill it
+ if (pid_file_option() and not pid_file().empty())
+ {
+ kill_file(pid_file());
+ }
+ Error << "Failed to ping() server started with:" << _running;
+ _running.clear();
+ return false;
+ }
+
+ // A failing get_pid() at this point is considered an error
+ _pid= get_pid(true);
+
+ return has_pid();
+}
+
+void Server::reset_pid()
+{
+ _running.clear();
+ _pid_file.clear();
+ _pid= -1;
+}
+
+pid_t Server::pid()
+{
+ return _pid;
+}
+
+bool Server::set_socket_file()
+{
+ char file_buffer[FILENAME_MAX];
+ file_buffer[0]= 0;
+
+ if (broken_pid_file())
+ {
+ snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.socketXXXXXX", name());
+ }
+ else
+ {
+ snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name());
+ }
+
+ int fd;
+ if ((fd= mkstemp(file_buffer)) == -1)
+ {
+ perror(file_buffer);
+ return false;
+ }
+ close(fd);
+ unlink(file_buffer);
+
+ _socket= file_buffer;
+
+ return true;
+}
+
+bool Server::set_pid_file()
+{
+ char file_buffer[FILENAME_MAX];
+ file_buffer[0]= 0;
+
+ if (broken_pid_file())
+ {
+ snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.pidXXXXXX", name());
+ }
+ else
+ {
+ snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name());
+ }
+
+ int fd;
+ if ((fd= mkstemp(file_buffer)) == -1)
+ {
+ perror(file_buffer);
+ return false;
+ }
+ close(fd);
+ unlink(file_buffer);
+
+ _pid_file= file_buffer;
+
+ return true;
+}
+
+bool Server::set_log_file()
+{
+ char file_buffer[FILENAME_MAX];
+ file_buffer[0]= 0;
+
+ snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name());
+ int fd;
+ if ((fd= mkstemp(file_buffer)) == -1)
+ {
+ perror(file_buffer);
+ return false;
+ }
+ close(fd);
+
+ _log_file= file_buffer;
+
+ return true;
+}
+
+void Server::rebuild_base_command()
+{
+ _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 (not set_log_file())
+ {
+ return false;
+ }
+
+ arg_buffer << " " << log_file_option() << _log_file;
+ }
+
+ // Update pid_file
+ if (pid_file_option())
+ {
+ if (_pid_file.empty() and not set_pid_file())
+ {
+ return false;
+ }
+
+ arg_buffer << " " << pid_file_option() << pid_file();
+ }
+
+ assert(daemon_file_option());
+ if (daemon_file_option() and not is_valgrind() and not is_helgrind())
+ {
+ arg_buffer << " " << daemon_file_option();
+ }
+
+ if (_is_socket and socket_file_option())
+ {
+ if (not set_socket_file())
+ {
+ return false;
+ }
+
+ arg_buffer << " " << socket_file_option() << "\"" << _socket << "\"";
+ }
+
+ assert(port_option());
+ if (port_option() and _port > 0)
+ {
+ arg_buffer << " " << port_option() << _port;