projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update
[awesomized/libmemcached]
/
libtest
/
server.h
diff --git
a/libtest/server.h
b/libtest/server.h
index b193fb8ffd21f617d79a178a0477f4e17bb090c0..c9700e95e620fe6a28ff2bc2aba1ee4149b5b043 100644
(file)
--- a/
libtest/server.h
+++ b/
libtest/server.h
@@
-39,6
+39,7
@@
private:
typedef std::vector< std::pair<std::string, std::string> > Options;
private:
typedef std::vector< std::pair<std::string, std::string> > Options;
private:
+ uint64_t _magic;
bool _is_socket;
std::string _socket;
std::string _sasl;
bool _is_socket;
std::string _socket;
std::string _sasl;
@@
-54,13
+55,13
@@
protected:
std::string _extra_args;
public:
std::string _extra_args;
public:
- Server(const std::string& hostname, const in_port_t port_arg, const bool is_socket_arg= false);
+ Server(const std::string& hostname, const in_port_t port_arg,
+ const std::string& executable, const bool _is_libtool,
+ const bool is_socket_arg= false);
virtual ~Server();
virtual const char *name()= 0;
virtual ~Server();
virtual const char *name()= 0;
- virtual const char *executable()= 0;
- virtual const char *daemon_file_option()= 0;
virtual bool is_libtool()= 0;
virtual bool has_socket_file_option() const
virtual bool is_libtool()= 0;
virtual bool has_socket_file_option() const
@@
-78,7
+79,7
@@
public:
}
}
}
}
- bool has_log_file_option() const
+
virtual
bool has_log_file_option() const
{
return false;
}
{
return false;
}
@@
-223,15
+224,20
@@
public:
return _running;
}
return _running;
}
+ bool check();
+
std::string log_and_pid();
bool kill(pid_t pid_arg);
bool start();
bool command(libtest::Application& app);
std::string log_and_pid();
bool kill(pid_t pid_arg);
bool start();
bool command(libtest::Application& app);
+ bool validate();
+
protected:
bool set_pid_file();
Options _options;
protected:
bool set_pid_file();
Options _options;
+ Application _app;
private:
bool is_helgrind() const;
private:
bool is_helgrind() const;