diff options
Diffstat (limited to 'lib/server/ServerControl.h')
| -rw-r--r-- | lib/server/ServerControl.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/server/ServerControl.h b/lib/server/ServerControl.h index be2464c1..28320491 100644 --- a/lib/server/ServerControl.h +++ b/lib/server/ServerControl.h @@ -4,11 +4,17 @@ #include "Test.h" bool HUPServer(int pid); -bool KillServer(int pid, bool WaitForProcess = false); -bool KillServer(std::string pid_file, bool WaitForProcess = false); -int StartDaemon(int current_pid, const std::string& cmd_line, const char* pid_file); -bool StopDaemon(int current_pid, const std::string& pid_file, - const std::string& memleaks_file, bool wait_for_process); +bool KillServer(int pid, bool wait_for_process = false); +bool KillServer(const std::string& pid_file, bool wait_for_process = false); +bool KillServerInternal(int pid); +int StartDaemon(int current_pid, const std::string& cmd_line, const char* pid_file, int port = 0, + const std::string& socket_path = ""); +bool StopDaemon(int current_pid, const std::string& pid_file, const std::string& memleaks_file, + bool wait_for_process); +int LaunchServer(const std::string& rCommandLine, const char *pidFile, int port = 0, + const std::string& socket_path = ""); +int WaitForServerStartup(const char *pidFile, int pidIfKnown, int port = 0, + const std::string& socket_path = ""); #ifdef WIN32 #include "WinNamedPipeStream.h" |