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

Revert "terminal: use edge-triggered FDM handler for the PTY"

Browse source 
This reverts commit f5e27b49eb.
This commit is contained in:
Daniel Eklöf 2020-01-10 19:51:16 +01:00
parent 3957d50a8a
commit 5bfc560451
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
terminal.c
View file

@ -38,7 +38,7 @@ term_to_slave(struct terminal *term, const void *_data, size_t len)
{ {
size_t async_idx = 0; size_t async_idx = 0;
if (tll_length(term->ptmx_buffer) > 0) { if (tll_length(term->ptmx_buffer) > 0) {
/* Append to queue, FDM handler will send it */ /* With a non-empty queue, EPOLLOUT has already been enabled */
goto enqueue_data; goto enqueue_data;
} }
@ -49,6 +49,9 @@ term_to_slave(struct terminal *term, const void *_data, size_t len)
switch (async_write(term->ptmx, _data, len, &async_idx)) { switch (async_write(term->ptmx, _data, len, &async_idx)) {
case ASYNC_WRITE_REMAIN: case ASYNC_WRITE_REMAIN:
/* Switch to asynchronous mode; let FDM write the remaining data */
if (!fdm_event_add(term->fdm, term->ptmx, EPOLLOUT))
return false;
goto enqueue_data; goto enqueue_data;
case ASYNC_WRITE_DONE: case ASYNC_WRITE_DONE:
@ -87,8 +90,8 @@ fdm_ptmx_out(struct fdm *fdm, int fd, int events, void *data)
{ {
struct terminal *term = data; struct terminal *term = data;
if (tll_length(term->ptmx_buffer) == 0) /* If there is no queued data, then we shouldn't be in asynchronous mode */
return true; assert(tll_length(term->ptmx_buffer) > 0);
/* Don't use pop() since we may not be able to write the entire buffer */ /* Don't use pop() since we may not be able to write the entire buffer */
tll_foreach(term->ptmx_buffer, it) { tll_foreach(term->ptmx_buffer, it) {
@ -109,6 +112,8 @@ fdm_ptmx_out(struct fdm *fdm, int fd, int events, void *data)
} }
} }
/* No more queued data, switch back to synchronous mode */
fdm_event_del(term->fdm, term->ptmx, EPOLLOUT);
return true; return true;
} }
@ -140,21 +145,16 @@ fdm_ptmx(struct fdm *fdm, int fd, int events, void *data)
if (!pollin) if (!pollin)
return true; return true;
while (true) { uint8_t buf[24 * 1024];
uint8_t buf[24 * 1024]; ssize_t count = read(term->ptmx, buf, sizeof(buf));
ssize_t count = read(term->ptmx, buf, sizeof(buf));
if (count < 0) { if (count < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK) LOG_ERRNO("failed to read from pseudo terminal");
break; return false;
LOG_ERRNO("failed to read from pseudo terminal");
return false;
}
vt_from_slave(term, buf, count);
} }
vt_from_slave(term, buf, count);
/* Prevent blinking while typing */ /* Prevent blinking while typing */
term_cursor_blink_restart(term); term_cursor_blink_restart(term);
@ -540,7 +540,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
goto err; goto err;
} }
if (!fdm_add(fdm, ptmx, EPOLLIN | EPOLLOUT | EPOLLET, &fdm_ptmx, term) || if (!fdm_add(fdm, ptmx, EPOLLIN, &fdm_ptmx, term) ||
!fdm_add(fdm, flash_fd, EPOLLIN, &fdm_flash, term) || !fdm_add(fdm, flash_fd, EPOLLIN, &fdm_flash, term) ||
!fdm_add(fdm, blink_fd, EPOLLIN, &fdm_blink, term) || !fdm_add(fdm, blink_fd, EPOLLIN, &fdm_blink, term) ||
!fdm_add(fdm, cursor_blink_fd, EPOLLIN, &fdm_cursor_blink, term) || !fdm_add(fdm, cursor_blink_fd, EPOLLIN, &fdm_cursor_blink, term) ||