luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: make uv_process_kill(proc, 0) report process status

Browse Source
This commit is contained in:
Ben Noordhuis 2011-10-10 23:34:00 +02:00
parent acc98ca922
commit a3d495c0bc
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/win/process.c
View File

@ -1053,13 +1053,34 @@ done:
int uv_process_kill(uv_process_t* process, int signum) {
process->exit_signal = signum;
DWORD status;
/* On windows killed processes normally return 1 */
if (process->process_handle != INVALID_HANDLE_VALUE &&
TerminateProcess(process->process_handle, 1)) {
return 0;
if (process->process_handle == INVALID_HANDLE_VALUE) {
uv__set_artificial_error(process->loop, UV_EINVAL);
return -1;
}
return -1;
if (signum) {
/* Kill the process. On Windows, killed processes normally return 1. */
if (TerminateProcess(process->process_handle, 1)) {
process->exit_signal = signum;
return 0;
}
else {
uv__set_sys_error(process->loop, GetLastError());
return -1;
}
}
else {
/* Health check: is the process still alive? */
if (GetExitCodeProcess(process->process_handle, &status) && status == STILL_ACTIVE) {
return 0;
}
else {
uv__set_artificial_error(process->loop, UV_EINVAL);
return -1;
}
}
assert(0 && "unreachable");
}