diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-10-11 23:55:26 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-10-11 23:55:26 +0000 |
| commit | bc236109fd8b858f1bfd7e4b9c5d5e493bdd1563 (patch) | |
| tree | e9f9eab7bc648d160904421f6e7f756b4efef557 /buffer-poll.c | |
| parent | 07ad6da7e826db31f3de174c0036f0e0400f9207 (diff) | |
Sync OpenBSD patchset 374:
Rather than running status-left, status-right and window title #() with popen
immediately every redraw, queue them up and run them in the background,
starting each once every status-interval. The actual status line uses the
output from the last run.
This brings several advantages:
- tmux itself may be called from inside #() without causing the server to hang;
- likewise, sleep or similar doesn't cause the server to block;
- commands aren't run excessively often when redrawing;
- commands shared by status-left and status-right, or used multiple times, will
only be run once.
run-shell and if-shell still use system()/popen() but will be changed over to
use this too later.
Diffstat (limited to 'buffer-poll.c')
| -rw-r--r-- | buffer-poll.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/buffer-poll.c b/buffer-poll.c index 1af3c99a..87153d16 100644 --- a/buffer-poll.c +++ b/buffer-poll.c @@ -1,4 +1,4 @@ -/* $Id: buffer-poll.c,v 1.16 2009-08-19 09:28:10 nicm Exp $ */ +/* $Id: buffer-poll.c,v 1.17 2009-10-11 23:55:26 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -29,9 +29,9 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) { ssize_t n; - if (pfd->revents & (POLLERR|POLLNVAL|POLLHUP)) + if (pfd->revents & (POLLERR|POLLNVAL)) return (-1); - if (pfd->revents & POLLIN) { + if (in != NULL && pfd->revents & POLLIN) { buffer_ensure(in, BUFSIZ); n = read(pfd->fd, BUFFER_IN(in), BUFFER_FREE(in)); if (n == 0) @@ -41,8 +41,9 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) return (-1); } else buffer_add(in, n); - } - if (BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { + } else if (pfd->revents & POLLHUP) + return (-1); + if (out != NULL && BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); if (n == -1) { if (errno != EINTR && errno != EAGAIN) |