projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add in -Wparentheses
[awesomized/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index f747dc229b4e47d620f1b9390a214a261c18f4db..2c31796f3e141c64530df63aabf99b253725e862 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-75,31
+75,54
@@
Server* server_startup_st::pop_server()
return tmp;
}
return tmp;
}
-
void server_startup_st::shutdown(bool remove
)
+
bool server_startup_st::shutdown(uint32_t number_of_host
)
{
{
- if (
remove
)
+ if (
servers.size() > number_of_host
)
{
{
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ Server* tmp= servers[number_of_host];
+
+ if (tmp and tmp->has_pid() and not tmp->kill(tmp->pid()))
+ { }
+ else
{
{
-
delete *iter
;
+
return true
;
}
}
- servers.clear();
}
}
- else
+
+ return false;
+}
+
+void server_startup_st::shutdown_and_remove()
+{
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
{
{
- for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ delete *iter;
+ }
+ servers.clear();
+}
+
+void server_startup_st::shutdown()
+{
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ {
+ if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid()))
{
{
- if ((*iter)->has_pid() and not (*iter)->kill((*iter)->pid()))
- {
- Error << "Unable to kill:" << *(*iter);
- }
+ Error << "Unable to kill:" << *(*iter);
}
}
}
}
}
}
+void server_startup_st::restart()
+{
+ for (std::vector<Server *>::iterator iter= servers.begin(); iter != servers.end(); iter++)
+ {
+ (*iter)->start();
+ }
+}
+
server_startup_st::~server_startup_st()
{
server_startup_st::~server_startup_st()
{
- shutdown
(true
);
+ shutdown
_and_remove(
);
}
bool server_startup_st::is_debug() const
}
bool server_startup_st::is_debug() const
@@
-123,6
+146,8
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
Outn();
(void)try_port;
Outn();
(void)try_port;
+ set_max_port(try_port);
+
// Look to see if we are being provided ports to use
{
char variable_buffer[1024];
// Look to see if we are being provided ports to use
{
char variable_buffer[1024];
@@
-149,33
+174,20
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_gearmand("localhost", try_port);
}
{
server= build_gearmand("localhost", try_port);
}
- else
- {
- Error << "Libgearman was not found";
- }
- }
- else
- {
- Error << "No gearmand binary is available";
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
}
}
else if (server_type.compare("blobslap_worker") == 0)
{
- if (GEARMAND_BINARY
and GEARMAND_BLOBSLAP_WORKER
)
+ if (GEARMAND_BINARY)
{
{
- if (
HAVE_LIBGEARMAN
)
+ if (
GEARMAND_BLOBSLAP_WORKER
)
{
{
- server= build_blobslap_worker(try_port);
- }
- else
- {
- Error << "Libgearman was not found";
+ if (HAVE_LIBGEARMAN)
+ {
+ server= build_blobslap_worker(try_port);
+ }
}
}
}
}
- else
- {
- Error << "No gearmand binary is available";
- }
}
else if (server_type.compare("memcached-sasl") == 0)
{
}
else if (server_type.compare("memcached-sasl") == 0)
{
@@
-185,14
+197,6
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password());
}
{
server= build_memcached_sasl("localhost", try_port, construct.username(), construct.password());
}
- else
- {
- Error << "Libmemcached was not found";
- }
- }
- else
- {
- Error << "No memcached binary that was compiled with sasl is available";
}
}
else if (server_type.compare("memcached") == 0)
}
}
else if (server_type.compare("memcached") == 0)
@@
-203,20
+207,8
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
{
server= build_memcached("localhost", try_port);
}
{
server= build_memcached("localhost", try_port);
}
- else
- {
- Error << "Libmemcached was not found";
- }
- }
- else
- {
- Error << "No memcached binary is available";
}
}
}
}
- else
- {
- Error << "Failed to start " << server_type << ", no support was found to be compiled in for it.";
- }
if (server == NULL)
{
if (server == NULL)
{
@@
-227,7
+219,7
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
/*
We will now cycle the server we have created.
*/
/*
We will now cycle the server we have created.
*/
- if (
not server->cycle()
)
+ if (
server->cycle() == false
)
{
Error << "Could not start up server " << *server;
delete server;
{
Error << "Could not start up server " << *server;
delete server;
@@
-244,7
+236,7
@@
bool server_startup(server_startup_st& construct, const std::string& server_type
Out << "run " << server->args(options);
getchar();
}
Out << "run " << server->args(options);
getchar();
}
- else if (
not server->start()
)
+ else if (
server->start() == false
)
{
Error << "Failed to start " << *server;
delete server;
{
Error << "Failed to start " << *server;
delete server;