amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 11:17:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

完善windows下子进程管理

Browse Source
This commit is contained in:
xiongziliang 2020-06-08 15:49:32 +08:00
parent b08ea0fcc7
commit 20e8e1d7ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/Process.cpp
View File

@ -151,7 +151,7 @@ static bool s_wait(pid_t pid,int *exit_code_ptr,bool block) {
HANDLE hProcess = NULL; HANDLE hProcess = NULL;
hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); //打开目标进程 hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); //打开目标进程
if (!hProcess) { if (!hProcess) {
WarnL << "OpenProcess failed:" << get_uv_errmsg(); //子进程不在线
return false; return false;
} }
@ -166,7 +166,7 @@ static bool s_wait(pid_t pid,int *exit_code_ptr,bool block) {
if(code == WAIT_FAILED || code == WAIT_OBJECT_0){ if(code == WAIT_FAILED || code == WAIT_OBJECT_0){
//子进程已经退出了,获取子进程退出代码 //子进程已经退出了,获取子进程退出代码
DWORD exitCode = 0; DWORD exitCode = 0;
if(GetExitCodeProcess(hProcess, &exitCode) && exit_code_ptr){ if(exit_code_ptr && GetExitCodeProcess(hProcess, &exitCode)){
*exit_code_ptr = exitCode; *exit_code_ptr = exitCode;
} }
CloseHandle(hProcess); CloseHandle(hProcess);
@ -244,6 +244,9 @@ static void s_kill(pid_t pid,int max_delay,bool force){
//子进程可能已经推出了 //子进程可能已经推出了
return; return;
} }
//windows下目前没有比较好的手段往子进程发送SIGTERM或信号
//所以杀死子进程的方式全部强制为立即关闭
force = true;
if(force){ if(force){
//强制关闭 //强制关闭
DWORD ret = TerminateProcess(hProcess, 0); //结束目标进程 DWORD ret = TerminateProcess(hProcess, 0); //结束目标进程