projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170
[m6w6/libmemcached]
/
libtest
/
server.h
diff --git
a/libtest/server.h
b/libtest/server.h
index c4e7579cf8975b33838b64641f3abb1bb56fa7d9..f51388089747dc36d88356450969e7507f84536e 100644
(file)
--- a/
libtest/server.h
+++ b/
libtest/server.h
@@
-41,15
+41,8
@@
#include <cassert>
#include <cstdio>
#include <cstring>
#include <cassert>
#include <cstdio>
#include <cstring>
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
+#include <netdb.h>
+#include <netinet/in.h>
#include <string>
#include <unistd.h>
#include <vector>
#include <string>
#include <unistd.h>
#include <vector>
@@
-230,6
+223,11
@@
public:
_error= arg;
}
_error= arg;
}
+ void reset_error()
+ {
+ _error.clear();
+ }
+
virtual bool wait_for_pidfile() const;
bool check_pid(pid_t pid_arg) const
virtual bool wait_for_pidfile() const;
bool check_pid(pid_t pid_arg) const
@@
-239,7
+237,7
@@
public:
bool is_socket() const
{
bool is_socket() const
{
- return _
hostname[0] == '/'
;
+ return _
is_socket
;
}
const std::string running() const
}
const std::string running() const
@@
-267,6
+265,11
@@
public:
return out_of_ban_killed_;
}
return out_of_ban_killed_;
}
+ void timeout(uint32_t timeout_)
+ {
+ _timeout= timeout_;
+ }
+
protected:
bool set_pid_file();
Options _options;
protected:
bool set_pid_file();
Options _options;
@@
-283,6
+286,7
@@
private:
bool args(Application&);
std::string _error;
bool args(Application&);
std::string _error;
+ uint32_t _timeout; // This number should be high enough for valgrind startup (which is slow)
};
std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
};
std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);