From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 29 Oct 2012 22:39:48 +0000 (+0100)
Subject: ustream: add a poll callback function defined by the ustream implementation
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=dc69ce4799deb53797266d55311871b9c0062066;hp=df0968d19b034fe174f6268fb13f19e1d32f9ca1;ds=sidebyside

ustream: add a poll callback function defined by the ustream implementation
---

diff --git a/ustream-fd.c b/ustream-fd.c
index c2e70db..6bb39e9 100644
--- a/ustream-fd.c
+++ b/ustream-fd.c
@@ -40,7 +40,7 @@ static void ustream_fd_set_uloop(struct ustream *s)
 		sf->fd.cb(&sf->fd, ULOOP_READ);
 }
 
-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;
@@ -67,6 +67,7 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
 		}
 
 		ustream_fill_read(s, len);
+		*more = true;
 	} while (1);
 }
 
@@ -94,14 +95,14 @@ retry:
 	return len;
 }
 
-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;
+	struct uloop_fd *fd = &sf->fd;
+	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))
@@ -113,8 +114,23 @@ static void ustream_uloop_cb(struct uloop_fd *fd, unsigned int events)
 		ustream_fd_set_uloop(s);
 		ustream_state_change(s);
 	}
+
+	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);
+}
+
+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)
 {
@@ -134,5 +150,6 @@ void ustream_fd_init(struct ustream_fd *sf, int fd)
 	s->set_read_blocked = ustream_fd_set_uloop;
 	s->write = ustream_fd_write;
 	s->free = ustream_fd_free;
+	s->poll = ustream_fd_poll;
 	ustream_fd_set_uloop(s);
 }
diff --git a/ustream.h b/ustream.h
index 29f370f..d9f98b7 100644
--- a/ustream.h
+++ b/ustream.h
@@ -101,6 +101,14 @@ struct ustream {
 	void (*set_read_blocked)(struct ustream *s);
 
 	/*
+	 * poll: (optional)
+	 * defined by the upstream implementation, called to request polling for
+	 * available data.
+	 * returns true if data was fetched.
+	 */
+	bool (*poll)(struct ustream *s);
+
+	/*
 	 * ustream user should set this if the input stream is expected
 	 * to contain string data. the core will keep all data 0-terminated.
 	 */
@@ -182,4 +190,12 @@ static inline void ustream_state_change(struct ustream *s)
 	uloop_timeout_set(&s->state_change, 0);
 }
 
+static inline bool ustream_poll(struct ustream *s)
+{
+	if (!s->poll)
+		return false;
+
+	return s->poll(s);
+}
+
 #endif