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

term: open FDs before allocating terminal struct

Browse source
This commit is contained in:
Daniel Eklöf 2019-10-28 18:46:03 +01:00
parent fe974956b0
commit 720d0df067
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 69 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

111
terminal.c
View file

@ -212,22 +212,46 @@ struct terminal *
term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl, term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
int argc, char *const *argv) int argc, char *const *argv)
{ {
struct terminal *term = malloc(sizeof(*term)); int ptmx = -1;
int flash_fd = -1;
int blink_fd = -1;
int delay_lower_fd = -1;
int delay_upper_fd = -1;
struct terminal *term = NULL;
struct render_worker_context worker_context[conf->render_worker_count];
if ((ptmx = posix_openpt(O_RDWR | O_NOCTTY)) == -1) {
LOG_ERRNO("failed to open PTY");
goto close_fds;
}
if ((flash_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1) {
LOG_ERRNO("failed to create flash timer FD");
goto close_fds;
}
if ((blink_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1) {
LOG_ERRNO("failed to create blink timer FD");
goto close_fds;
}
if ((delay_lower_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1 ||
(delay_upper_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1)
{
LOG_ERRNO("failed to create delayed rendering timer FDs");
goto close_fds;
}
term = malloc(sizeof(*term));
*term = (struct terminal) { *term = (struct terminal) {
.fdm = fdm, .fdm = fdm,
.quit = false, .quit = false,
.ptmx = posix_openpt(O_RDWR | O_NOCTTY), .ptmx = ptmx,
.cursor_keys_mode = CURSOR_KEYS_NORMAL, .cursor_keys_mode = CURSOR_KEYS_NORMAL,
.keypad_keys_mode = KEYPAD_NUMERICAL, .keypad_keys_mode = KEYPAD_NUMERICAL,
.auto_margin = true, .auto_margin = true,
.window_title_stack = tll_init(), .window_title_stack = tll_init(),
.scale = 1, .scale = 1,
.flash = { .flash = {.fd = flash_fd},
.fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK), .blink = {.fd = blink_fd},
},
.blink = {
.fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK),
},
.vt = { .vt = {
.state = 1, /* STATE_GROUND */ .state = 1, /* STATE_GROUND */
}, },
@ -282,14 +306,13 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
}, },
.delayed_render_timer = { .delayed_render_timer = {
.is_armed = false, .is_armed = false,
.lower_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC), .lower_fd = delay_lower_fd,
.upper_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC), .upper_fd = delay_upper_fd,
}, },
}; };
LOG_INFO("using %zu rendering threads", term->render.workers.count); LOG_INFO("using %zu rendering threads", term->render.workers.count);
struct render_worker_context worker_context[term->render.workers.count];
/* Initialize 'current' colors from the default colors */ /* Initialize 'current' colors from the default colors */
term->colors.fg = term->colors.default_fg; term->colors.fg = term->colors.default_fg;
@ -312,15 +335,6 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
memcpy(term->colors.table, term->colors.default_table, sizeof(term->colors.table)); memcpy(term->colors.table, term->colors.default_table, sizeof(term->colors.table));
} }
if (term->ptmx == -1) {
LOG_ERR("failed to open pseudo terminal");
goto out;
}
if (term->flash.fd == -1 || term->blink.fd == -1) {
LOG_ERR("failed to create timers");
goto out;
}
sem_init(&term->render.workers.start, 0, 0); sem_init(&term->render.workers.start, 0, 0);
sem_init(&term->render.workers.done, 0, 0); sem_init(&term->render.workers.done, 0, 0);
@ -340,7 +354,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
if ((term->fonts[0] = font_from_name(font_names, "")) == NULL) { if ((term->fonts[0] = font_from_name(font_names, "")) == NULL) {
tll_free(font_names); tll_free(font_names);
goto out; goto err;
} }
term->fonts[1] = font_from_name(font_names, "style=bold"); term->fonts[1] = font_from_name(font_names, "style=bold");
@ -369,10 +383,9 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
term->cell_height = (int)ceil(term->fextents.height); term->cell_height = (int)ceil(term->fextents.height);
LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height); LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height);
/* Main window */
term->window = wayl_win_init(wayl); term->window = wayl_win_init(wayl);
if (term->window == NULL) if (term->window == NULL)
goto out; goto err;
term_set_window_title(term, "foot"); term_set_window_title(term, "foot");
@ -393,7 +406,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
int fork_pipe[2]; int fork_pipe[2];
if (pipe2(fork_pipe, O_CLOEXEC) < 0) { if (pipe2(fork_pipe, O_CLOEXEC) < 0) {
LOG_ERRNO("failed to create pipe"); LOG_ERRNO("failed to create pipe");
goto out; goto err;
} }
term->slave = fork(); term->slave = fork();
@ -402,7 +415,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
LOG_ERRNO("failed to fork"); LOG_ERRNO("failed to fork");
close(fork_pipe[0]); close(fork_pipe[0]);
close(fork_pipe[1]); close(fork_pipe[1]);
goto out; goto err;
case 0: case 0:
/* Child */ /* Child */
@ -419,7 +432,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
shell_argv = _shell_argv; shell_argv = _shell_argv;
} }
slave_spawn(term->ptmx, shell_argv, fork_pipe[1]); slave_spawn(ptmx, shell_argv, fork_pipe[1]);
assert(false); assert(false);
break; break;
@ -435,11 +448,11 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
if (ret < 0) { if (ret < 0) {
LOG_ERRNO("failed to read from pipe"); LOG_ERRNO("failed to read from pipe");
goto out; goto err;
} else if (ret == sizeof(_errno)) { } else if (ret == sizeof(_errno)) {
LOG_ERRNO( LOG_ERRNO(
"%s: failed to execute", argc == 0 ? conf->shell : argv[0]); "%s: failed to execute", argc == 0 ? conf->shell : argv[0]);
goto out; goto err;
} else } else
LOG_DBG("%s: successfully started", conf->shell); LOG_DBG("%s: successfully started", conf->shell);
break; break;
@ -449,46 +462,60 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
/* Read logic requires non-blocking mode */ /* Read logic requires non-blocking mode */
{ {
int fd_flags = fcntl(term->ptmx, F_GETFL); int fd_flags = fcntl(ptmx, F_GETFL);
if (fd_flags == -1) { if (fd_flags == -1) {
LOG_ERRNO("failed to set non blocking mode on PTY master"); LOG_ERRNO("failed to set non blocking mode on PTY master");
goto out; goto err;
} }
if (fcntl(term->ptmx, F_SETFL, fd_flags | O_NONBLOCK) == -1) { if (fcntl(ptmx, F_SETFL, fd_flags | O_NONBLOCK) == -1) {
LOG_ERRNO("failed to set non blocking mode on PTY master"); LOG_ERRNO("failed to set non blocking mode on PTY master");
goto out; goto err;
} }
} }
if (!fdm_add(fdm, term->ptmx, EPOLLIN, &fdm_ptmx, term)) { if (!fdm_add(fdm, ptmx, EPOLLIN, &fdm_ptmx, term)) {
LOG_ERR("failed to add ptmx to FDM"); LOG_ERR("failed to add ptmx to FDM");
goto out; goto err;
} }
if (!fdm_add(fdm, term->flash.fd, EPOLLIN, &fdm_flash, term)) { if (!fdm_add(fdm, flash_fd, EPOLLIN, &fdm_flash, term)) {
LOG_ERR("failed to add flash timer FD to FDM"); LOG_ERR("failed to add flash timer FD to FDM");
goto out; goto err;
} }
if (!fdm_add(fdm, term->blink.fd, EPOLLIN, &fdm_blink, term)) { if (!fdm_add(fdm, blink_fd, EPOLLIN, &fdm_blink, term)) {
LOG_ERR("failed to add blink tiemr FD to FDM"); LOG_ERR("failed to add blink tiemr FD to FDM");
goto out; goto err;
} }
if (!fdm_add(fdm, term->delayed_render_timer.lower_fd, EPOLLIN, &fdm_delayed_render, term) || if (!fdm_add(fdm, delay_lower_fd, EPOLLIN, &fdm_delayed_render, term) ||
!fdm_add(fdm, term->delayed_render_timer.upper_fd, EPOLLIN, &fdm_delayed_render, term)) !fdm_add(fdm, delay_upper_fd, EPOLLIN, &fdm_delayed_render, term))
{ {
LOG_ERR("failed to add delayed rendering timer FDs to FDM"); LOG_ERR("failed to add delayed rendering timer FDs to FDM");
goto out; goto err;
} }
wayl->term = term; wayl->term = term;
return term; return term;
out: err:
term_destroy(term); term_destroy(term);
return NULL; return NULL;
close_fds:
if (ptmx != -1)
close(ptmx);
if (flash_fd != -1)
close(flash_fd);
if (blink_fd != -1)
close(blink_fd);
if (delay_lower_fd != -1)
close(delay_lower_fd);
if (delay_upper_fd != -1)
close(delay_upper_fd);
assert(term == NULL);
return NULL;
} }
int int