X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.h;h=b1ca30aa713f04e2d26eacd3fb955910dfeec541;hb=fe4757c512265eef4f8905b3392f19d33c436ddf;hp=68d5e2265053458a32864d3ed22f58eff4fd18cf;hpb=24ac12fa9cebb786966f5907d594c9506d19c29f;p=m6w6%2Flibmemcached diff --git a/libtest/server.h b/libtest/server.h index 68d5e226..b1ca30aa 100644 --- a/libtest/server.h +++ b/libtest/server.h @@ -47,7 +47,6 @@ private: std::string _log_file; std::string _base_command; // executable command which include libtool, valgrind, gdb, etc std::string _running; // Current string being used for system() - pid_t _pid; protected: in_port_t _port; @@ -163,8 +162,6 @@ public: virtual bool ping()= 0; - virtual pid_t get_pid(bool error_is_ok= false)= 0; - virtual bool build(size_t argc, const char *argv[])= 0; void add_option(const std::string&); @@ -188,24 +185,15 @@ public: // Reset a server if another process has killed the server void reset() { - _pid= -1; _pid_file.clear(); _log_file.clear(); } bool args(Application&); - pid_t pid(); - - pid_t pid() const - { - return _pid; - } + pid_t pid() const; - bool has_pid() const - { - return (_pid > 1); - } + bool has_pid() const; virtual bool wait_for_pidfile() const; @@ -228,7 +216,7 @@ public: std::string log_and_pid(); - bool kill(pid_t pid_arg); + bool kill(); bool start(); bool command(libtest::Application& app);