godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

Merge pull request #21236 from dragmz/windows-graceful-close

Browse Source 
Try closing gracefully before terminating process
This commit is contained in:
Rémi Verschelde
2018-08-21 22:47:21 +02:00
committed by GitHub
parent 0a8ac1a57c ca1c851dbd
commit 4bf15d8090
6 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@@ -254,7 +254,7 @@ public:
virtual String get_executable_path() const; virtual String get_executable_path() const;
virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false) = 0; virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false) = 0;
virtual Error kill(const ProcessID &p_pid) = 0; virtual Error kill(const ProcessID &p_pid, const int p_max_wait_msec = -1) = 0;
virtual int get_process_id() const; virtual int get_process_id() const;
virtual Error shell_open(String p_uri); virtual Error shell_open(String p_uri);

2
drivers/unix/os_unix.cpp
View File

@@ -329,7 +329,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
return OK; return OK;
} }
Error OS_Unix::kill(const ProcessID &p_pid) { Error OS_Unix::kill(const ProcessID &p_pid, const int p_max_wait_msec) {
int ret = ::kill(p_pid, SIGKILL); int ret = ::kill(p_pid, SIGKILL);
if (!ret) { if (!ret) {

2
drivers/unix/os_unix.h
View File

@@ -91,7 +91,7 @@ public:
virtual uint64_t get_ticks_usec() const; virtual uint64_t get_ticks_usec() const;
virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false); virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false);
virtual Error kill(const ProcessID &p_pid); virtual Error kill(const ProcessID &p_pid, const int p_max_wait_msec = -1);
virtual int get_process_id() const; virtual int get_process_id() const;
virtual bool has_environment(const String &p_var) const; virtual bool has_environment(const String &p_var) const;

4
editor/editor_run.cpp
View File

@@ -181,8 +181,8 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
void EditorRun::stop() { void EditorRun::stop() {
if (status != STATUS_STOP && pid != 0) { if (status != STATUS_STOP && pid != 0) {
const int max_wait_msec = GLOBAL_DEF("editor/stop_max_wait_msec", 10000);
OS::get_singleton()->kill(pid); OS::get_singleton()->kill(pid, max_wait_msec);
} }
status = STATUS_STOP; status = STATUS_STOP;

38
platform/windows/os_windows.cpp
View File

@@ -190,6 +190,28 @@ BOOL WINAPI HandlerRoutine(_In_ DWORD dwCtrlType) {
} }
} }
BOOL CALLBACK _CloseWindowsEnum(HWND hWnd, LPARAM lParam) {
DWORD dwID;
GetWindowThreadProcessId(hWnd, &dwID);
if (dwID == (DWORD)lParam) {
PostMessage(hWnd, WM_CLOSE, 0, 0);
}
return TRUE;
}
bool _close_gracefully(const PROCESS_INFORMATION &pi, const DWORD dwStopWaitMsec) {
if (!EnumWindows(_CloseWindowsEnum, pi.dwProcessId))
return false;
if (WaitForSingleObject(pi.hProcess, dwStopWaitMsec) != WAIT_OBJECT_0)
return false;
return true;
}
void OS_Windows::initialize_debugging() { void OS_Windows::initialize_debugging() {
SetConsoleCtrlHandler(HandlerRoutine, TRUE); SetConsoleCtrlHandler(HandlerRoutine, TRUE);
@@ -2322,20 +2344,26 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
return OK; return OK;
}; };
Error OS_Windows::kill(const ProcessID &p_pid) { Error OS_Windows::kill(const ProcessID &p_pid, const int p_max_wait_msec) {
ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED); ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED);
const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi; const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi;
process_map->erase(p_pid); process_map->erase(p_pid);
const int ret = TerminateProcess(pi.hProcess, 0); Error result;
if (p_max_wait_msec != -1 && _close_gracefully(pi, p_max_wait_msec)) {
result = OK;
} else {
const int ret = TerminateProcess(pi.hProcess, 0);
result = ret != 0 ? OK : FAILED;
}
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
return ret != 0 ? OK : FAILED; return result;
}; }
int OS_Windows::get_process_id() const { int OS_Windows::get_process_id() const {
return _getpid(); return _getpid();

2
platform/windows/os_windows.h
View File

@@ -258,7 +258,7 @@ public:
virtual uint64_t get_ticks_usec() const; virtual uint64_t get_ticks_usec() const;
virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false); virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false);
virtual Error kill(const ProcessID &p_pid); virtual Error kill(const ProcessID &p_pid, const int p_stop_max_wait_msec = -1);
virtual int get_process_id() const; virtual int get_process_id() const;
virtual bool has_environment(const String &p_var) const; virtual bool has_environment(const String &p_var) const;