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

Move creation of wakeup fds to c module

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-06 17:43:11 +05:30
parent 76890a2b71
commit 1308bbac2d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/boss.py
View File

@ -31,7 +31,7 @@ from .keys import (
from .session import create_session from .session import create_session
from .shaders import Sprites from .shaders import Sprites
from .tabs import SpecialWindow, TabManager from .tabs import SpecialWindow, TabManager
from .utils import handle_unix_signals, pipe2, safe_print from .utils import handle_unix_signals, safe_print
if isosx: if isosx:
from .fast_data_types import cocoa_update_title from .fast_data_types import cocoa_update_title
@ -101,10 +101,9 @@ class Boss(Thread):
self.resize_gl_viewport = False self.resize_gl_viewport = False
self.shutting_down = False self.shutting_down = False
self.signal_fd = handle_unix_signals() self.signal_fd = handle_unix_signals()
read_wakeup_fd, write_wakeup_fd = pipe2()
self.ui_timers = Timers() self.ui_timers = Timers()
self.child_monitor = ChildMonitor( self.child_monitor = ChildMonitor(
read_wakeup_fd, write_wakeup_fd, self.signal_fd, opts.repaint_delay / 1000.0, self.signal_fd, opts.repaint_delay / 1000.0,
self.on_child_death, self.update_screen, self.ui_timers, self.on_child_death, self.update_screen, self.ui_timers,
DumpCommands(args) if args.dump_commands or args.dump_bytes else None) DumpCommands(args) if args.dump_commands or args.dump_bytes else None)
set_boss(self) set_boss(self)

26
kitty/child-monitor.c
View File

@ -7,6 +7,7 @@
#include "data-types.h" #include "data-types.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <pthread.h> #include <pthread.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
@ -51,20 +52,35 @@ static uint8_t drain_buf[1024];
#define INCREF_CHILD(x) XREF_CHILD(x, Py_INCREF) #define INCREF_CHILD(x) XREF_CHILD(x, Py_INCREF)
#define DECREF_CHILD(x) XREF_CHILD(x, Py_DECREF) #define DECREF_CHILD(x) XREF_CHILD(x, Py_DECREF)
static inline bool
self_pipe(int fds[2]) {
int flags;
flags = pipe(fds);
if (flags != 0) return false;
flags = fcntl(fds[0], F_GETFD);
if (flags == -1) { return false; }
if (fcntl(fds[0], F_SETFD, flags | FD_CLOEXEC) == -1) { return false; }
flags = fcntl(fds[0], F_GETFL);
if (flags == -1) { return false; }
if (fcntl(fds[0], F_SETFL, flags | O_NONBLOCK) == -1) { return false; }
return true;
}
static PyObject * static PyObject *
new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) { new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
ChildMonitor *self; ChildMonitor *self;
PyObject *dump_callback, *death_notify, *update_screen, *timers; PyObject *dump_callback, *death_notify, *update_screen, *timers;
int wakeup_fd, write_wakeup_fd, signal_fd, ret; int signal_fd, ret, wakeup_fds[2];
double repaint_delay; double repaint_delay;
if (created) { PyErr_SetString(PyExc_RuntimeError, "Can have only a single ChildMonitor instance"); return NULL; } if (created) { PyErr_SetString(PyExc_RuntimeError, "Can have only a single ChildMonitor instance"); return NULL; }
if (!PyArg_ParseTuple(args, "iiidOOOO", &wakeup_fd, &write_wakeup_fd, &signal_fd, &repaint_delay, &death_notify, &update_screen, &timers, &dump_callback)) return NULL; if (!PyArg_ParseTuple(args, "idOOOO", &signal_fd, &repaint_delay, &death_notify, &update_screen, &timers, &dump_callback)) return NULL;
created = true; created = true;
if ((ret = pthread_mutex_init(&children_lock, NULL)) != 0) { if ((ret = pthread_mutex_init(&children_lock, NULL)) != 0) {
PyErr_Format(PyExc_RuntimeError, "Failed to create children_lock mutex: %s", strerror(ret)); PyErr_Format(PyExc_RuntimeError, "Failed to create children_lock mutex: %s", strerror(ret));
return NULL; return NULL;
} }
if (!self_pipe(wakeup_fds)) return PyErr_SetFromErrno(PyExc_OSError);
self = (ChildMonitor *)type->tp_alloc(type, 0); self = (ChildMonitor *)type->tp_alloc(type, 0);
if (self == NULL) return PyErr_NoMemory(); if (self == NULL) return PyErr_NoMemory();
self->death_notify = death_notify; Py_INCREF(death_notify); self->death_notify = death_notify; Py_INCREF(death_notify);
@ -75,9 +91,9 @@ new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
parse_func = parse_worker_dump; parse_func = parse_worker_dump;
} else parse_func = parse_worker; } else parse_func = parse_worker;
self->count = 0; self->count = 0;
fds[0].fd = wakeup_fd; fds[1].fd = signal_fd; fds[0].fd = wakeup_fds[0]; fds[1].fd = signal_fd;
fds[0].events = POLLIN; fds[1].events = POLLIN; fds[0].events = POLLIN; fds[1].events = POLLIN;
self->write_wakeup_fd = write_wakeup_fd; self->write_wakeup_fd = wakeup_fds[1];
self->repaint_delay = repaint_delay; self->repaint_delay = repaint_delay;
return (PyObject*) self; return (PyObject*) self;
@ -99,6 +115,8 @@ dealloc(ChildMonitor* self) {
add_queue_count--; add_queue_count--;
FREE_CHILD(add_queue[add_queue_count]); FREE_CHILD(add_queue[add_queue_count]);
} }
close(self->write_wakeup_fd);
close(fds[0].fd);
} }