DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Felix Fietkau 2012-10-29 23:39:48 +01:00
parent df0968d19b
commit dc69ce4799
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ustream-fd.c
View file

@ -40,7 +40,7 @@ static void ustream_fd_set_uloop(struct ustream *s)
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_read_pending(struct ustream_fd *sf, bool *more)
{ {
struct ustream *s = &sf->stream; struct ustream *s = &sf->stream;
int buflen = 0; int buflen = 0;
@ -67,6 +67,7 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *update)
} }
ustream_fill_read(s, len); ustream_fill_read(s, len);
*more = true;
} while (1); } while (1);
} }
@ -94,14 +95,14 @@ retry:
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, &update); ustream_fd_read_pending(sf, &more);
if (events & ULOOP_WRITE) { if (events & ULOOP_WRITE) {
if (ustream_write_pending(s)) 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_fd_set_uloop(s);
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);
}
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)
{ {
@ -134,5 +150,6 @@ void ustream_fd_init(struct ustream_fd *sf, int fd)
s->set_read_blocked = ustream_fd_set_uloop; s->set_read_blocked = ustream_fd_set_uloop;
s->write = ustream_fd_write; s->write = ustream_fd_write;
s->free = ustream_fd_free; s->free = ustream_fd_free;
s->poll = ustream_fd_poll;
ustream_fd_set_uloop(s); ustream_fd_set_uloop(s);
} }

16
ustream.h
View file

@ -100,6 +100,14 @@ struct ustream {
*/ */
void (*set_read_blocked)(struct ustream *s); 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 * ustream user should set this if the input stream is expected
* to contain string data. the core will keep all data 0-terminated. * 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); 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 #endif