#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;
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;
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)
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)
+ 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);
+ if (!ustream_write_pending(s))
+ ustream_fd_set_uloop(s, false);
}
- if (!s->eof && fd->eof) {
- s->eof = true;
- 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 | 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)
{
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);
}