IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "event/process.c: send SIGTERM directly (#6644)"

Browse Source 
This reverts commit 34c3f03013.
This commit is contained in:
Justin M. Keyes 2017-05-08 13:49:23 +02:00
parent a6f74debc0
commit 7c1a5d1d40
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/event/process.c
View File

@ -20,9 +20,9 @@
# include "event/process.c.generated.h" # include "event/process.c.generated.h"
#endif #endif
// Time for a process to exit cleanly before we send KILL. // Time (ns) for a process to exit cleanly before we send TERM/KILL.
#define KILL_TIMEOUT_MS 2000 #define TERM_TIMEOUT 1000000000
#define KILL_TIMEOUT_NS (KILL_TIMEOUT_MS * 1000000) #define KILL_TIMEOUT (TERM_TIMEOUT * 2)
#define CLOSE_PROC_STREAM(proc, stream) \ #define CLOSE_PROC_STREAM(proc, stream) \
do { \ do { \
@ -121,6 +121,8 @@ void process_teardown(Loop *loop) FUNC_ATTR_NONNULL_ALL
// Close handles to process without killing it. // Close handles to process without killing it.
CREATE_EVENT(loop->events, process_close_handles, 1, proc); CREATE_EVENT(loop->events, process_close_handles, 1, proc);
} else { } else {
uv_kill(proc->pid, SIGTERM);
proc->term_sent = true;
process_stop(proc); process_stop(proc);
} }
} }
@ -242,16 +244,12 @@ void process_stop(Process *proc) FUNC_ATTR_NONNULL_ALL
abort(); abort();
} }
ILOG("Sending SIGTERM to pid %d", proc->pid);
uv_kill(proc->pid, SIGTERM);
Loop *loop = proc->loop; Loop *loop = proc->loop;
if (!loop->children_stop_requests++) { if (!loop->children_stop_requests++) {
// When there's at least one stop request pending, start a timer that // When there's at least one stop request pending, start a timer that
// will periodically check if a signal should be send to the job. // will periodically check if a signal should be send to a to the job
DLOG("Starting job kill timer"); DLOG("Starting job kill timer");
uv_timer_start(&loop->children_kill_timer, children_kill_cb, uv_timer_start(&loop->children_kill_timer, children_kill_cb, 100, 100);
KILL_TIMEOUT_MS, 100);
} }
} }
@ -269,7 +267,11 @@ static void children_kill_cb(uv_timer_t *handle)
} }
uint64_t elapsed = now - proc->stopped_time; uint64_t elapsed = now - proc->stopped_time;
if (elapsed >= KILL_TIMEOUT_NS) { if (!proc->term_sent && elapsed >= TERM_TIMEOUT) {
ILOG("Sending SIGTERM to pid %d", proc->pid);
uv_kill(proc->pid, SIGTERM);
proc->term_sent = true;
} else if (elapsed >= KILL_TIMEOUT) {
ILOG("Sending SIGKILL to pid %d", proc->pid); ILOG("Sending SIGKILL to pid %d", proc->pid);
uv_kill(proc->pid, SIGKILL); uv_kill(proc->pid, SIGKILL);
} }

3
src/nvim/event/process.h
View File

@ -26,7 +26,7 @@ struct process {
Stream *in, *out, *err; Stream *in, *out, *err;
process_exit_cb cb; process_exit_cb cb;
internal_process_cb internal_exit_cb, internal_close_cb; internal_process_cb internal_exit_cb, internal_close_cb;
bool closed, detach; bool closed, term_sent, detach;
MultiQueue *events; MultiQueue *events;
}; };
@ -48,6 +48,7 @@ static inline Process process_init(Loop *loop, ProcessType type, void *data)
.err = NULL, .err = NULL,
.cb = NULL, .cb = NULL,
.closed = false, .closed = false,
.term_sent = false,
.internal_close_cb = NULL, .internal_close_cb = NULL,
.internal_exit_cb = NULL, .internal_exit_cb = NULL,
.detach = false .detach = false