mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-01 07:15:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

terminal: cleanup asynchronous ptmx output handling

Browse source 
Break out actual writing to a separate function, and call this
function both from the synchronous and the asynchronous code paths.
This commit is contained in:
Daniel Eklöf 2019-11-03 01:25:41 +01:00
parent b4c810cf50
commit cba1551b03
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

84
terminal.c
View file

@ -26,34 +26,49 @@
#define min(x, y) ((x) < (y) ? (x) : (y)) #define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y)) #define max(x, y) ((x) > (y) ? (x) : (y))
enum ptmx_write_status {PTMX_WRITE_DONE, PTMX_WRITE_REMAIN, PTMX_WRITE_ERR};
static enum ptmx_write_status
to_slave(struct terminal *term, const void *_data, size_t len, size_t *idx)
{
const uint8_t *const data = _data;
size_t left = len - *idx;
while (left > 0) {
ssize_t ret = write(term->ptmx, &data[*idx], left);
if (ret < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK)
return PTMX_WRITE_REMAIN;
LOG_ERRNO("failed to write to client");
return PTMX_WRITE_ERR;
}
*idx += ret;
left -= left;
}
return PTMX_WRITE_DONE;
}
bool bool
term_to_slave(struct terminal *term, const void *_data, size_t len) term_to_slave(struct terminal *term, const void *_data, size_t len)
{ {
if (tll_length(term->ptmx_buffer) > 0) if (tll_length(term->ptmx_buffer) > 0) {
/* With a non-empty queue, EPOLLOUT has already been enabled */
goto enqueue_data; goto enqueue_data;
const uint8_t *data = _data;
size_t left = len;
while (left > 0) {
ssize_t ret = write(term->ptmx, data, left);
if (ret < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
LOG_ERRNO("failed to write to client");
return false;
}
if (!fdm_event_add(term->fdm, term->ptmx, EPOLLOUT))
return false;
goto enqueue_data;
}
data += ret;
left -= ret;
} }
return true; switch (to_slave(term, _data, len, &(size_t){0})) {
case PTMX_WRITE_REMAIN:
if (!fdm_event_add(term->fdm, term->ptmx, EPOLLOUT))
return false;
goto enqueue_data;
case PTMX_WRITE_DONE: return true;
case PTMX_WRITE_ERR: return false;
}
enqueue_data: enqueue_data:
{ {
@ -78,26 +93,15 @@ fdm_ptmx_out(struct fdm *fdm, int fd, int events, void *data)
assert(tll_length(term->ptmx_buffer) > 0); assert(tll_length(term->ptmx_buffer) > 0);
tll_foreach(term->ptmx_buffer, it) { tll_foreach(term->ptmx_buffer, it) {
const uint8_t *const data = it->item.data; switch (to_slave(term, it->item.data, it->item.len, &it->item.idx)) {
size_t left = it->item.len - it->item.idx; case PTMX_WRITE_DONE:
free(it->item.data);
tll_remove(term->ptmx_buffer, it);
break;
while (left > 0) { case PTMX_WRITE_REMAIN: return true; /* to_slave() updated it->item.idx */
ssize_t ret = write(term->ptmx, &data[it->item.idx], left); case PTMX_WRITE_ERR: return false;
if (ret < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
LOG_ERRNO("failed to write to client");
return false;
}
return true;
}
it->item.idx += ret;
left -= ret;
} }
free(it->item.data);
tll_remove(term->ptmx_buffer, it);
} }
fdm_event_del(term->fdm, term->ptmx, EPOLLOUT); fdm_event_del(term->fdm, term->ptmx, EPOLLOUT);