KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure the moitor threads are shut down on exit

Browse Source
This commit is contained in:
Kovid Goyal 2018-03-02 10:32:12 +05:30
parent 5bfc89e13f
commit b491eacb9c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/child-monitor.c
View File

@ -191,6 +191,7 @@ wakeup_io_loop(bool in_signal_handler) {
static void* io_loop(void *data);
static void* talk_loop(void *data);
static void send_response(int fd, const char *msg, size_t msg_sz);
static void wakeup_talk_loop(bool);
static PyObject *
start(ChildMonitor *self) {
@ -292,6 +293,8 @@ shutdown_monitor(ChildMonitor *self) {
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
self->shutting_down = true;
wakeup_talk_loop(false);
wakeup_io_loop(false);
Py_RETURN_NONE;
}
@ -1074,6 +1077,19 @@ prune_finished_reads() {
}
}
static void
wakeup_talk_loop(bool in_signal_handler) {
if (talk_data.wakeup_fds[1] <= 0) return;
while(true) {
ssize_t ret = write(talk_data.wakeup_fds[1], "w", 1);
if (ret < 0) {
if (errno == EINTR) continue;
if (!in_signal_handler) perror("Failed to write to talk wakeup fd with error");
}
break;
}
}
static void*
talk_loop(void *data) {
// The talk thread loop