diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-05-31 20:04:15 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-05-31 20:04:15 +0000 |
| commit | 5569ff9723fcacb0e0206f02adbb4b85368bc1bf (patch) | |
| tree | 76f9b0f74c209069e484a89554b66234ba40452f /buffer-poll.c | |
| parent | abe745f99126838079e8d70318983a3b66356573 (diff) | |
| download | rtmux-5569ff9723fcacb0e0206f02adbb4b85368bc1bf.tar.gz rtmux-5569ff9723fcacb0e0206f02adbb4b85368bc1bf.tar.bz2 rtmux-5569ff9723fcacb0e0206f02adbb4b85368bc1bf.zip | |
Don't hang when window closes early; also add lots more debugging.
Diffstat (limited to 'buffer-poll.c')
| -rw-r--r-- | buffer-poll.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/buffer-poll.c b/buffer-poll.c index 099ee4ad..5e37bead 100644 --- a/buffer-poll.c +++ b/buffer-poll.c @@ -1,4 +1,4 @@ -/* $Id: buffer-poll.c,v 1.4 2007-11-30 11:08:34 nicm Exp $ */ +/* $Id: buffer-poll.c,v 1.5 2008-05-31 20:04:15 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -41,11 +41,15 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) { ssize_t n; + log_debug("buffer_poll (%d): fd=%d, revents=%d; out=%zu in=%zu", + getpid(), pfd->fd, pfd->revents, BUFFER_USED(out), BUFFER_USED(in)); + if (pfd->revents & (POLLERR|POLLNVAL|POLLHUP)) return (-1); if (pfd->revents & POLLIN) { buffer_ensure(in, BUFSIZ); n = read(pfd->fd, BUFFER_IN(in), BUFFER_FREE(in)); + log_debug("buffer_poll: fd=%d, read=%zd", pfd->fd, n); if (n == 0) return (-1); if (n == -1) { @@ -55,7 +59,8 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) buffer_add(in, n); } if (BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { - n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); + n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); + log_debug("buffer_poll: fd=%d, write=%zd", pfd->fd, n); if (n == -1) { if (errno != EINTR && errno != EAGAIN) return (-1); |