mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-23 05:33:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-crash-when-closing-window'

Browse source 
Closes #289
This commit is contained in:
Daniel Eklöf 2021-01-12 13:27:09 +01:00
commit 61b7bf91f7
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pgo/pgo.c
View file

@ -136,6 +136,7 @@ notify_notify(const struct terminal *term, const char *title, const char *body)
} }
void reaper_add(struct reaper *reaper, pid_t pid, reaper_cb cb, void *cb_data) {} void reaper_add(struct reaper *reaper, pid_t pid, reaper_cb cb, void *cb_data) {}
void reaper_del(struct reaper *reaper, pid_t pid) {}
int int

31
reaper.c
View file

@ -98,6 +98,17 @@ reaper_add(struct reaper *reaper, pid_t pid, reaper_cb cb, void *cb_data)
((struct child){.pid = pid, .cb = cb, .cb_data = cb_data})); ((struct child){.pid = pid, .cb = cb, .cb_data = cb_data}));
} }
void
reaper_del(struct reaper *reaper, pid_t pid)
{
tll_foreach(reaper->children, it) {
if (it->item.pid == pid) {
tll_remove(reaper->children, it);
break;
}
}
}
static bool static bool
fdm_reap(struct fdm *fdm, int fd, int events, void *data) fdm_reap(struct fdm *fdm, int fd, int events, void *data)
{ {
@ -127,23 +138,27 @@ fdm_reap(struct fdm *fdm, int fd, int events, void *data)
} }
tll_foreach(reaper->children, it) { tll_foreach(reaper->children, it) {
struct child *child = &it->item; struct child *_child = &it->item;
pid_t pid = child->pid;
if (pid != (pid_t)info.ssi_pid) if (_child->pid != (pid_t)info.ssi_pid)
continue; continue;
/* Make sure we remove it *before* the callback, since it too
* may remove it */
struct child child = it->item;
tll_remove(reaper->children, it);
bool reap_ourselves = true; bool reap_ourselves = true;
if (child->cb != NULL) if (child.cb != NULL)
reap_ourselves = !child->cb(reaper, pid, child->cb_data); reap_ourselves = !child.cb(reaper, child.pid, child.cb_data);
if (reap_ourselves) { if (reap_ourselves) {
int result; int result;
int res = waitpid(pid, &result, WNOHANG); int res = waitpid(child.pid, &result, WNOHANG);
if (res <= 0) { if (res <= 0) {
if (res < 0) if (res < 0)
LOG_ERRNO("waitpid failed for pid=%d", pid); LOG_ERRNO("waitpid failed for pid=%d", child.pid);
continue; continue;
} }
@ -154,8 +169,6 @@ fdm_reap(struct fdm *fdm, int fd, int events, void *data)
else else
LOG_DBG("pid=%d: died of unknown resason", pid); LOG_DBG("pid=%d: died of unknown resason", pid);
} }
tll_remove(reaper->children, it);
} }
if (hup) if (hup)

1
reaper.h
View file

@ -13,3 +13,4 @@ void reaper_destroy(struct reaper *reaper);
typedef bool (*reaper_cb)(struct reaper *reaper, pid_t pid, void *data); typedef bool (*reaper_cb)(struct reaper *reaper, pid_t pid, void *data);
void reaper_add(struct reaper *reaper, pid_t pid, reaper_cb cb, void *cb_data); void reaper_add(struct reaper *reaper, pid_t pid, reaper_cb cb, void *cb_data);
void reaper_del(struct reaper *reaper, pid_t pid);

3
terminal.c
View file

@ -1334,6 +1334,9 @@ term_shutdown(struct terminal *term)
fdm_del(term->fdm, term->blink.fd); fdm_del(term->fdm, term->blink.fd);
fdm_del(term->fdm, term->flash.fd); fdm_del(term->fdm, term->flash.fd);
/* We’ll deal with this explicitly */
reaper_del(term->reaper, term->slave);
if (term->window != NULL && term->window->is_configured) if (term->window != NULL && term->window->is_configured)
fdm_del(term->fdm, term->ptmx); fdm_del(term->fdm, term->ptmx);
else else