edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7236 from furo321/add-is-process-alive

Browse source 
Detect if server started from client is no longer running
This commit is contained in:
Robert Müller 2023-09-23 08:50:39 +00:00 committed by GitHub
parent 33c47bff4d 3da0b34444
commit 25b110c153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/base/system.cpp
View file

@ -4149,18 +4149,35 @@ int kill_process(PROCESS process)
{
#if defined(CONF_FAMILY_WINDOWS)
BOOL success = TerminateProcess(process, 0);
if(success)
BOOL is_alive = is_process_alive(process);
if(success || !is_alive)
{
CloseHandle(process);
return true;
}
return success;
return false;
#elif defined(CONF_FAMILY_UNIX)
if(!is_process_alive(process))
return true;
int status;
kill(process, SIGTERM);
return waitpid(process, &status, 0) != -1;
#endif
}
bool is_process_alive(PROCESS process)
{
if(process == INVALID_PROCESS)
return false;
#if defined(CONF_FAMILY_WINDOWS)
DWORD exit_code;
GetExitCodeProcess(process, &exit_code);
return exit_code == STILL_ACTIVE;
#else
return waitpid(process, nullptr, WNOHANG) == 0;
#endif
}
int open_link(const char *link)
{
#if defined(CONF_FAMILY_WINDOWS)

9
src/base/system.h
View file

@ -2648,6 +2648,15 @@ PROCESS shell_execute(const char *file);
*/
int kill_process(PROCESS process);
/**
* Checks if a process is alive.
*
* @param process Handle/PID of the process.
*
* @return bool Returns true if the process is currently running, false if the process is not running (dead).
*/
bool is_process_alive(PROCESS process);
/*
Function: generate_password
Generates a null-terminated password of length `2 *

4
src/game/client/components/menus_start.cpp
View file

@ -135,6 +135,10 @@ void CMenus::RenderStartMenu(CUIRect MainView)
Menu.HSplitBottom(5.0f, &Menu, 0); // little space
Menu.HSplitBottom(40.0f, &Menu, &Button);
static CButtonContainer s_LocalServerButton;
if(!is_process_alive(m_ServerProcess.m_Process))
KillServer();
if(DoButton_Menu(&s_LocalServerButton, m_ServerProcess.m_Process ? Localize("Stop server") : Localize("Run server"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), m_ServerProcess.m_Process ? vec4(0.0f, 1.0f, 0.0f, 0.25f) : vec4(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
{
if(m_ServerProcess.m_Process)