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

Remove unnecessary extra lock/unlock of children_mutex

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-06 15:24:30 +05:30
parent 0e46994d0a
commit 2c8f3b6d98
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kitty/child-monitor.c
View File

@ -245,7 +245,6 @@ mark_for_close(ChildMonitor *self, PyObject *args) {
static inline void static inline void
add_children(ChildMonitor *self) { add_children(ChildMonitor *self) {
children_mutex(lock);
for (; add_queue_count > 0 && self->count < MAX_CHILDREN;) { for (; add_queue_count > 0 && self->count < MAX_CHILDREN;) {
add_queue_count--; add_queue_count--;
children[self->count] = add_queue[add_queue_count]; children[self->count] = add_queue[add_queue_count];
@ -255,13 +254,11 @@ add_children(ChildMonitor *self) {
self->count++; self->count++;
DECREF_CHILD(add_queue[add_queue_count]); DECREF_CHILD(add_queue[add_queue_count]);
} }
children_mutex(unlock);
} }
static inline bool static inline bool
remove_children(ChildMonitor *self) { remove_children(ChildMonitor *self) {
size_t count = 0; size_t count = 0;
children_mutex(lock);
if (self->count == 0) goto end; if (self->count == 0) goto end;
for (ssize_t i = self->count - 1; i >= 0; i--) { for (ssize_t i = self->count - 1; i >= 0; i--) {
if (children[i].needs_removal) { if (children[i].needs_removal) {
@ -276,7 +273,6 @@ remove_children(ChildMonitor *self) {
} }
self->count -= count; self->count -= count;
end: end:
children_mutex(unlock);
return count ? true : false; return count ? true : false;
} }
@ -356,10 +352,12 @@ loop(ChildMonitor *self) {
Screen *screen; Screen *screen;
while (LIKELY(!self->shutting_down)) { while (LIKELY(!self->shutting_down)) {
data_received = false; children_mutex(lock);
remove_children(self); remove_children(self);
add_children(self); add_children(self);
children_mutex(unlock);
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
data_received = false;
for (i = 0; i < self->count + EXTRA_FDS; i++) fds[i].revents = 0; for (i = 0; i < self->count + EXTRA_FDS; i++) fds[i].revents = 0;
for (i = 0; i < self->count; i++) { for (i = 0; i < self->count; i++) {
screen = children[i].screen; screen = children[i].screen;
@ -396,8 +394,8 @@ loop(ChildMonitor *self) {
perror("Call to poll() failed"); perror("Call to poll() failed");
} }
} }
Py_END_ALLOW_THREADS;
if (data_received) glfwPostEmptyEvent(); if (data_received) glfwPostEmptyEvent();
Py_END_ALLOW_THREADS;
} }
for (i = 0; i < self->count; i++) children[i].needs_removal = true; for (i = 0; i < self->count; i++) children[i].needs_removal = true;
remove_children(self); remove_children(self);