mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-10 14:14:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock on macOS caused by recent support for pipe peers

Browse Source 
Apparently on macOS we cant post an event to the main loop if the main loop is
waiting on a lock we are holding. Absurd.

Fixes #6751
This commit is contained in:
Kovid Goyal
2023-10-25 18:16:13 +05:30
parent 0ce996120a
commit 61c4f80e90
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/child-monitor.c
View File

@@ -1782,7 +1782,6 @@ prune_peers(ChildMonitor *self) {
pruned = true;
}
}
if (pruned) wakeup_main_loop();
return pruned;
}
@@ -1834,6 +1833,7 @@ talk_loop(void *data) {
while (LIKELY(!self->shutting_down)) {
num_peer_fds = 0;
bool need_to_wakup_main_loop = false;
talk_mutex(lock);
if (peers_to_inject.num) {
for (size_t i = 0; i < peers_to_inject.num; i++) {
@@ -1844,7 +1844,7 @@ talk_loop(void *data) {
peers_to_inject.num = 0;
}
if (talk_data.num_peers > 0) {
prune_peers(self);
if (prune_peers(self)) need_to_wakup_main_loop = true;
for (size_t i = 0; i < talk_data.num_peers; i++) {
Peer *p = talk_data.peers + i;
if (!p->read.finished || p->write.used) {
@@ -1859,6 +1859,7 @@ talk_loop(void *data) {
}
}
talk_mutex(unlock);
if (need_to_wakup_main_loop) wakeup_main_loop();
for (size_t i = 0; i < num_listen_fds; i++) fds[i].revents = 0;
int ret = poll(fds, num_listen_fds + num_peer_fds, -1);
if (ret > 0) {