X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=ustream-fd.c;h=b546fa1c6968c96edda17908457bfd89fb7923f2;hp=c2e70db516a215671ec746a300514db5ccbfaef6;hb=6a7fb7d8df308d18167051447fa489de389588df;hpb=768a69b3cedfebde10825847e42f35ed4aee1856

diff --git a/ustream-fd.c b/ustream-fd.c
index c2e70db..b546fa1 100644
--- a/ustream-fd.c
+++ b/ustream-fd.c
@@ -21,26 +21,28 @@
 #include <stdio.h>
 #include "ustream.h"
 
-static void ustream_fd_set_uloop(struct ustream *s)
+static void ustream_fd_set_uloop(struct ustream *s, bool write)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
 	struct ustream_buf *buf;
-	unsigned int flags = ULOOP_EDGE_TRIGGER;
+	unsigned int flags = ULOOP_EDGE_TRIGGER | ULOOP_ERROR_CB;
 
 	if (!s->read_blocked && !s->eof)
 		flags |= ULOOP_READ;
 
 	buf = s->w.head;
-	if (buf && s->w.data_bytes && !s->write_error)
+	if (write || (buf && s->w.data_bytes && !s->write_error))
 		flags |= ULOOP_WRITE;
 
 	uloop_fd_add(&sf->fd, flags);
+}
 
-	if (flags & ULOOP_READ)
-		sf->fd.cb(&sf->fd, ULOOP_READ);
+static void ustream_fd_set_read_blocked(struct ustream *s)
+{
+	ustream_fd_set_uloop(s, false);
 }
 
-static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
+static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
 {
 	struct ustream *s = &sf->stream;
 	int buflen = 0;
@@ -48,73 +50,105 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
 	char *buf;
 
 	do {
+		if (s->read_blocked)
+			break;
+
 		buf = ustream_reserve(s, 1, &buflen);
 		if (!buf)
 			break;
 
 		len = read(sf->fd.fd, buf, buflen);
-		if (!len) {
-			sf->fd.eof = true;
-			return;
-		}
-
 		if (len < 0) {
 			if (errno == EINTR)
 				continue;
 
-			if (errno == EAGAIN)
+			if (errno == EAGAIN || errno == ENOTCONN)
 				return;
+
+			len = 0;
+		}
+
+		if (!len) {
+			if (!s->eof)
+				ustream_state_change(s);
+			s->eof = true;
+			ustream_fd_set_uloop(s, false);
+			return;
 		}
 
 		ustream_fill_read(s, len);
+		*more = true;
 	} while (1);
 }
 
 static int ustream_fd_write(struct ustream *s, const char *buf, int buflen, bool more)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
-	ssize_t len;
+	ssize_t ret = 0, len;
 
 	if (!buflen)
 		return 0;
 
-retry:
-	len = write(sf->fd.fd, buf, buflen);
-	if (!len)
-		goto retry;
+	while (buflen) {
+		len = write(sf->fd.fd, buf, buflen);
+
+		if (len < 0) {
+			if (errno == EINTR)
+				continue;
+
+			if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOTCONN)
+				break;
 
-	if (len < 0) {
-		if (errno == EINTR)
-			goto retry;
+			return -1;
+		}
 
-		if (errno == EAGAIN || errno == EWOULDBLOCK)
-			return 0;
+		ret += len;
+		buf += len;
+		buflen -= len;
 	}
 
-	return len;
+	if (buflen)
+		ustream_fd_set_uloop(s, true);
+
+	return ret;
 }
 
-static void ustream_uloop_cb(struct uloop_fd *fd, unsigned int events)
+static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)
 {
-	struct ustream_fd *sf = container_of(fd, struct ustream_fd, fd);
 	struct ustream *s = &sf->stream;
-	bool update = false;
+	bool more = false;
 
 	if (events & ULOOP_READ)
-		ustream_fd_read_pending(sf, &update);
+		ustream_fd_read_pending(sf, &more);
 
 	if (events & ULOOP_WRITE) {
-		if (ustream_write_pending(s))
-			ustream_fd_set_uloop(s);
+		bool no_more = ustream_write_pending(s);
+		if (no_more)
+			ustream_fd_set_uloop(s, false);
 	}
 
-	if (!s->eof && fd->eof) {
-		s->eof = true;
-		ustream_fd_set_uloop(s);
+	if (sf->fd.error && !s->write_error) {
 		ustream_state_change(s);
+		s->write_error = true;
+		ustream_fd_set_uloop(s, false);
 	}
+
+	return more;
 }
 
+static bool ustream_fd_poll(struct ustream *s)
+{
+	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
+
+	return __ustream_fd_poll(sf, ULOOP_READ | ULOOP_WRITE);
+}
+
+static void ustream_uloop_cb(struct uloop_fd *fd, unsigned int events)
+{
+	struct ustream_fd *sf = container_of(fd, struct ustream_fd, fd);
+
+	__ustream_fd_poll(sf, events);
+}
 
 static void ustream_fd_free(struct ustream *s)
 {
@@ -131,8 +165,9 @@ void ustream_fd_init(struct ustream_fd *sf, int fd)
 
 	sf->fd.fd = fd;
 	sf->fd.cb = ustream_uloop_cb;
-	s->set_read_blocked = ustream_fd_set_uloop;
+	s->set_read_blocked = ustream_fd_set_read_blocked;
 	s->write = ustream_fd_write;
 	s->free = ustream_fd_free;
-	ustream_fd_set_uloop(s);
+	s->poll = ustream_fd_poll;
+	ustream_fd_set_uloop(s, false);
 }