projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: fix typo
[awesomized/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index d58b362ed5c8927f3cbb9231b4590c667e2318b0..7f3a2d1eda5947444f60a7e23392e893c7642b26 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-34,7
+34,8
@@
*
*/
*
*/
-#include <config.h>
+#include "libtest/yatlcon.h"
+
#include <libtest/common.h>
#include <cassert>
#include <libtest/common.h>
#include <cassert>
@@
-97,7
+98,7
@@
class Buffer
{
public:
Buffer(char *b) : b_(b) {}
{
public:
Buffer(char *b) : b_(b) {}
- ~Buffer() { free(b_); }
+ ~Buffer() {
if (b_)
free(b_); }
char* buf() { return b_; }
private:
char *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),
_port(port_arg),
_hostname(host_arg),
_app(executable, _is_libtool),
- out_of_ban_killed_(false)
+ out_of_ban_killed_(false),
+ _timeout(40)
{
}
{
}
@@
-128,8
+130,7
@@
Server::~Server()
bool Server::check()
{
_app.slurp();
bool Server::check()
{
_app.slurp();
- _app.check();
- return true;
+ return _app.check();
}
bool Server::validate()
}
bool Server::validate()
@@
-171,6
+172,22
@@
bool Server::wait_for_pidfile() const
return wait.successful();
}
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);
bool Server::has_pid() const
{
return (_app.pid() > 1);
@@
-179,22
+196,11
@@
bool Server::has_pid() const
bool Server::start()
{
bool Server::start()
{
- // If we find that we already have a pid then kill it.
- if (has_pid() == true)
+ if (getenv("YATL_GDB_SERVER"))
{
{
-#if 0
- fatal_message("has_pid() failed, programer error");
-#endif
+ _app.use_gdb(true);
}
}
- // This needs more work.
-#if 0
- if (gdb_is_caller())
- {
- _app.use_gdb();
- }
-#endif
-
if (port() == LIBTEST_FAIL_PORT)
{
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
if (port() == LIBTEST_FAIL_PORT)
{
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
@@
-203,13
+209,14
@@
bool Server::start()
if (getenv("YATL_PTRCHECK_SERVER"))
{
if (getenv("YATL_PTRCHECK_SERVER"))
{
- _app.use_ptrcheck();
+ _app.use_ptrcheck(
true
);
}
else if (getenv("YATL_VALGRIND_SERVER"))
{
}
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,
if (args(_app) == false)
{
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
@@
-252,8
+259,9
@@
bool Server::start()
Buffer buf( get_current_dir_name());
char *getcwd_buf= buf.buf();
#else
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(),
#endif // __GLIBC__
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
hostname(), port(),
@@
-268,11
+276,10
@@
bool Server::start()
bool pinged= false;
uint32_t this_wait= 0;
{
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;
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)
{
{
if (_app.check() == false)
{
@@
-283,13
+290,11
@@
bool Server::start()
{
break;
}
{
break;
}
- else if (waited >= timeout)
+ else if (waited >=
_
timeout)
{
break;
}
{
break;
}
- Error << "ping(" << _app.pid() << ") wait: " << this_wait << " " << hostname() << ":" << port() << " " << error();
-
this_wait= retry * retry / 3 + 1;
libtest::dream(this_wait, 0);
}
this_wait= retry * retry / 3 + 1;
libtest::dream(this_wait, 0);
}
@@
-297,6
+302,10
@@
bool Server::start()
if (pinged == false)
{
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))
{
// 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
+373,76
@@
void Server::add_option(const std::string& name_, const std::string& value_)
bool Server::set_socket_file()
{
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())
{
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
{
}
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;
}
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);
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()
{
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())
{
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
{
}
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;
}
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);
}
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()
{
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;
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;
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);
}
close(fd);
- _log_file=
file_buffer
;
+ _log_file=
&file_buffer[0]
;
return true;
}
return true;
}
@@
-477,13
+489,16
@@
bool Server::args(Application& app)
for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter)
{
for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter)
{
- if ((*iter).
second
.empty() == false)
+ if ((*iter).
first
.empty() == false)
{
{
- app.add_option((*iter).first, (*iter).second);
- }
- else
- {
- app.add_option((*iter).first);
+ if ((*iter).second.empty() == false)
+ {
+ app.add_option((*iter).first, (*iter).second);
+ }
+ else
+ {
+ app.add_option((*iter).first);
+ }
}
}
}
}