projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uloop: improve edge trigger reliability on mac os x
[project/libubox.git]
/
ustream-fd.c
diff --git
a/ustream-fd.c
b/ustream-fd.c
index
c2e70db
..
a47ff94
100644
(file)
--- a/
ustream-fd.c
+++ b/
ustream-fd.c
@@
-21,7
+21,9
@@
#include <stdio.h>
#include "ustream.h"
#include <stdio.h>
#include "ustream.h"
-static void ustream_fd_set_uloop(struct ustream *s)
+static bool _init = false;
+
+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;
{
struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
struct ustream_buf *buf;
@@
-31,16
+33,21
@@
static void ustream_fd_set_uloop(struct ustream *s)
flags |= ULOOP_READ;
buf = s->w.head;
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);
flags |= ULOOP_WRITE;
uloop_fd_add(&sf->fd, flags);
- if (
flags & ULOOP_READ)
+ if (
(flags & ULOOP_READ) && !_init);
sf->fd.cb(&sf->fd, ULOOP_READ);
}
sf->fd.cb(&sf->fd, ULOOP_READ);
}
-static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
+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 *more)
{
struct ustream *s = &sf->stream;
int buflen = 0;
{
struct ustream *s = &sf->stream;
int buflen = 0;
@@
-53,20
+60,23
@@
static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
break;
len = read(sf->fd.fd, buf, buflen);
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;
if (len < 0) {
if (errno == EINTR)
continue;
if (errno == EAGAIN)
return;
+
+ len = 0;
+ }
+
+ if (!len) {
+ sf->fd.eof = true;
+ return;
}
ustream_fill_read(s, len);
}
ustream_fill_read(s, len);
+ *more = true;
} while (1);
}
} while (1);
}
@@
-88,33
+98,51
@@
retry:
goto retry;
if (errno == EAGAIN || errno == EWOULDBLOCK)
goto retry;
if (errno == EAGAIN || errno == EWOULDBLOCK)
-
return
0;
+
len =
0;
}
}
+ if (len >= 0 && len < buflen)
+ ustream_fd_set_uloop(s, true);
+
return len;
}
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;
struct ustream *s = &sf->stream;
- bool update = false;
+ struct uloop_fd *fd = &sf->fd;
+ bool more = false;
if (events & ULOOP_READ)
if (events & ULOOP_READ)
- ustream_fd_read_pending(sf, &
updat
e);
+ ustream_fd_read_pending(sf, &
mor
e);
if (events & ULOOP_WRITE) {
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;
}
if (!s->eof && fd->eof) {
s->eof = true;
- ustream_fd_set_uloop(s);
+ ustream_fd_set_uloop(s
, false
);
ustream_state_change(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)
{
static void ustream_fd_free(struct ustream *s)
{
@@
-131,8
+159,11
@@
void ustream_fd_init(struct ustream_fd *sf, int fd)
sf->fd.fd = fd;
sf->fd.cb = ustream_uloop_cb;
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;
s->write = ustream_fd_write;
s->free = ustream_fd_free;
- ustream_fd_set_uloop(s);
+ s->poll = ustream_fd_poll;
+ _init = true;
+ ustream_fd_set_uloop(s, false);
+ _init = false;
}
}