From f24b6294c2d070e03ce663a60cdc50c9e5ab50e8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 30 Jan 2013 17:48:55 +0100 Subject: [PATCH] ustream-fd: only use read() == 0 as eof indication, and issue a state change notification when that happens Signed-off-by: Felix Fietkau --- ustream-fd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ustream-fd.c b/ustream-fd.c index a252708..e39da98 100644 --- a/ustream-fd.c +++ b/ustream-fd.c @@ -72,6 +72,8 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more) if (!len) { sf->fd.eof = true; + ustream_state_change(s); + ustream_fd_set_uloop(s, false); return; } @@ -115,7 +117,6 @@ static int ustream_fd_write(struct ustream *s, const char *buf, int buflen, bool static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events) { struct ustream *s = &sf->stream; - struct uloop_fd *fd = &sf->fd; bool more = false; if (events & ULOOP_READ) @@ -126,12 +127,6 @@ static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events) ustream_fd_set_uloop(s, false); } - if (!s->eof && fd->eof) { - s->eof = true; - ustream_fd_set_uloop(s, false); - ustream_state_change(s); - } - return more; } -- 2.11.0