aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-01 19:24:13 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-01 19:24:13 +0000
commit2e78dcc5e5cd2d5a2ae6a1f136467fc99a6dfd57 (patch)
tree519e18fe0200682ceb86d5405cfe5ac996f2344e /terminal.c
parentwayland: wayl_win_destroy(): unmap windows before destroying (diff)
Don't use non-blocking FDs
We use epoll() to determine when we can read/write FDs so there's absolutely no need for non-blocking.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/terminal.c b/terminal.c
index f32586ff..5dc75d7a 100644
--- a/terminal.c
+++ b/terminal.c
@@ -310,35 +310,21 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
LOG_ERRNO("failed to open PTY");
goto close_fds;
}
- if ((flash_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1) {
+ if ((flash_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC)) == -1) {
LOG_ERRNO("failed to create flash timer FD");
goto close_fds;
}
- if ((blink_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)) == -1) {
+ if ((blink_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC)) == -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)
+ if ((delay_lower_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC)) == -1 ||
+ (delay_upper_fd = timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC)) == -1)
{
LOG_ERRNO("failed to create delayed rendering timer FDs");
goto close_fds;
}
- /* Read logic requires non-blocking mode */
- {
- int fd_flags = fcntl(ptmx, F_GETFL);
- if (fd_flags == -1) {
- LOG_ERRNO("failed to set non blocking mode on PTY master");
- goto err;
- }
-
- if (fcntl(ptmx, F_SETFL, fd_flags | O_NONBLOCK) == -1) {
- LOG_ERRNO("failed to set non blocking mode on PTY master");
- goto err;
- }
- }
-
if (!fdm_add(fdm, ptmx, EPOLLIN, &fdm_ptmx, term)) {
LOG_ERR("failed to add ptmx to FDM");
goto err;
@@ -574,7 +560,7 @@ term_shutdown(struct terminal *term)
* This is done by opening an event FD and adding it to the FDM.
*/
- int event_fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
+ int event_fd = eventfd(0, EFD_CLOEXEC);
if (event_fd == -1) {
LOG_ERRNO("failed to create terminal shutdown event FD");
return false;