mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

os: add proper process termination with p.signal_term() (#20671)

Browse source
This commit is contained in:
Seweryn 2024-01-27 22:25:36 +01:00 • committed by GitHub
parent af2fbafecc
commit 5f7e6ff13a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
vlib/os/process.c.v
View file

@ -14,8 +14,15 @@ pub fn (mut p Process) signal_kill() {
} }
p._signal_kill() p._signal_kill()
p.status = .aborted p.status = .aborted
}
// signal_term - terminate the process
pub fn (mut p Process) signal_term() {
if p.status !in [.running, .stopped] {
return return
} }
p._signal_term()
}
// signal_pgkill - kills the whole process group // signal_pgkill - kills the whole process group
pub fn (mut p Process) signal_pgkill() { pub fn (mut p Process) signal_pgkill() {
@ -23,7 +30,6 @@ pub fn (mut p Process) signal_pgkill() {
return return
} }
p._signal_pgkill() p._signal_pgkill()
return
} }
// signal_stop - stops the process, you can resume it with p.signal_continue() // signal_stop - stops the process, you can resume it with p.signal_continue()
@ -33,7 +39,6 @@ pub fn (mut p Process) signal_stop() {
} }
p._signal_stop() p._signal_stop()
p.status = .stopped p.status = .stopped
return
} }
// signal_continue - tell a stopped process to continue/resume its work // signal_continue - tell a stopped process to continue/resume its work
@ -43,7 +48,6 @@ pub fn (mut p Process) signal_continue() {
} }
p._signal_continue() p._signal_continue()
p.status = .running p.status = .running
return
} }
// wait - wait for a process to finish. // wait - wait for a process to finish.
@ -60,7 +64,6 @@ pub fn (mut p Process) wait() {
return return
} }
p._wait() p._wait()
return
} }
// close - free the OS resources associated with the process. // close - free the OS resources associated with the process.
@ -132,7 +135,6 @@ pub fn (mut p Process) set_redirect_stdio() {
$if trace_process_pipes ? { $if trace_process_pipes ? {
eprintln('${@LOCATION}, pid: ${p.pid}, status: ${p.status}') eprintln('${@LOCATION}, pid: ${p.pid}, status: ${p.status}')
} }
return
} }
// stdin_write will write the string `s`, to the stdin pipe of the child process. // stdin_write will write the string `s`, to the stdin pipe of the child process.
@ -290,6 +292,15 @@ fn (mut p Process) _signal_kill() {
} }
} }
// _signal_term - should not be called directly, except by p.signal_term
fn (mut p Process) _signal_term() {
$if windows {
p.win_term_process()
} $else {
p.unix_term_process()
}
}
// _signal_pgkill - should not be called directly, except by p.signal_pgkill // _signal_pgkill - should not be called directly, except by p.signal_pgkill
fn (mut p Process) _signal_pgkill() { fn (mut p Process) _signal_pgkill() {
$if windows { $if windows {
@ -323,5 +334,4 @@ pub fn (mut p Process) run() {
return return
} }
p._spawn() p._spawn()
return
} }

7
vlib/os/process_nix.c.v
View file

@ -74,6 +74,10 @@ fn (mut p Process) unix_resume_process() {
C.kill(p.pid, C.SIGCONT) C.kill(p.pid, C.SIGCONT)
} }
fn (mut p Process) unix_term_process() {
C.kill(p.pid, C.SIGTERM)
}
fn (mut p Process) unix_kill_process() { fn (mut p Process) unix_kill_process() {
C.kill(p.pid, C.SIGKILL) C.kill(p.pid, C.SIGKILL)
} }
@ -127,6 +131,9 @@ fn (mut p Process) win_stop_process() {
fn (mut p Process) win_resume_process() { fn (mut p Process) win_resume_process() {
} }
fn (mut p Process) win_term_process() {
}
fn (mut p Process) win_kill_process() { fn (mut p Process) win_kill_process() {
} }

7
vlib/os/process_windows.c.v
View file

@ -157,6 +157,10 @@ fn (mut p Process) win_kill_process() {
C.TerminateProcess(wdata.proc_info.h_process, 3) C.TerminateProcess(wdata.proc_info.h_process, 3)
} }
fn (mut p Process) win_term_process() {
p.win_kill_process()
}
fn (mut p Process) win_kill_pgroup() { fn (mut p Process) win_kill_pgroup() {
wdata := unsafe { &WProcess(p.wdata) } wdata := unsafe { &WProcess(p.wdata) }
C.GenerateConsoleCtrlEvent(C.CTRL_BREAK_EVENT, wdata.proc_info.dw_process_id) C.GenerateConsoleCtrlEvent(C.CTRL_BREAK_EVENT, wdata.proc_info.dw_process_id)
@ -279,6 +283,9 @@ fn (mut p Process) unix_stop_process() {
fn (mut p Process) unix_resume_process() { fn (mut p Process) unix_resume_process() {
} }
fn (mut p Process) unix_term_process() {
}
fn (mut p Process) unix_kill_process() { fn (mut p Process) unix_kill_process() {
} }