mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add convenience functions to hook up pa_fdsem and pa_asyncmsgq to an pa_rtpoll; add pa_rtpoll_item_get_userdata(), on EINTR/EAGAIN, reset revents; automatically destory left over items

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1700 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-22 17:11:26 +00:00
parent 7490977a84
commit b937009bcd
2 changed files with 91 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/pulsecore/rtpoll.c
View file

@ -241,7 +241,9 @@ static void rtpoll_item_destroy(pa_rtpoll_item *i) {
void pa_rtpoll_free(pa_rtpoll *p) {
pa_assert(p);
pa_assert(!p->items);
while (p->items)
rtpoll_item_destroy(p->items);
pa_xfree(p->pollfd);
pa_xfree(p->pollfd2);
@ -256,6 +258,8 @@ void pa_rtpoll_free(pa_rtpoll *p) {
int pa_rtpoll_run(pa_rtpoll *p) {
pa_rtpoll_item *i;
int r = 0;
int no_events = 0;
int saved_errno;
pa_assert(p);
pa_assert(!p->running);
@ -308,8 +312,12 @@ int pa_rtpoll_run(pa_rtpoll *p) {
r = poll(p->pollfd, p->n_pollfd_used, p->interval > 0 ? p->interval / 1000 : -1);
#endif
if (r < 0 && (errno == EAGAIN || errno == EINTR))
saved_errno = errno;
if (r < 0 && (errno == EAGAIN || errno == EINTR)) {
r = 0;
no_events = 1;
}
for (i = p->items; i; i = i->next) {
@ -319,6 +327,13 @@ int pa_rtpoll_run(pa_rtpoll *p) {
if (!i->after_cb)
continue;
if (no_events) {
unsigned j;
for (j = 0; j < i->n_pollfd; j++)
i->pollfd[j].revents = 0;
}
i->after_cb(i);
}
@ -339,6 +354,8 @@ finish:
}
}
errno = saved_errno;
return r;
}
@ -452,3 +469,68 @@ void pa_rtpoll_item_set_userdata(pa_rtpoll_item *i, void *userdata) {
i->userdata = userdata;
}
void* pa_rtpoll_item_get_userdata(pa_rtpoll_item *i) {
pa_assert(i);
return i->userdata;
}
static int fdsem_before(pa_rtpoll_item *i) {
return pa_fdsem_before_poll(i->userdata);
}
static void fdsem_after(pa_rtpoll_item *i) {
pa_assert((i->pollfd[0].revents & ~POLLIN) == 0);
pa_fdsem_after_poll(i->userdata);
}
pa_rtpoll_item *pa_rtpoll_item_new_fdsem(pa_rtpoll *p, pa_fdsem *f) {
pa_rtpoll_item *i;
struct pollfd *pollfd;
pa_assert(p);
pa_assert(f);
i = pa_rtpoll_item_new(p, 1);
pollfd = pa_rtpoll_item_get_pollfd(i, NULL);
pollfd->fd = pa_fdsem_get(f);
pollfd->events = POLLIN;
i->before_cb = fdsem_before;
i->after_cb = fdsem_after;
i->userdata = f;
return i;
}
static int asyncmsgq_before(pa_rtpoll_item *i) {
return pa_asyncmsgq_before_poll(i->userdata);
}
static void asyncmsgq_after(pa_rtpoll_item *i) {
pa_assert((i->pollfd[0].revents & ~POLLIN) == 0);
pa_asyncmsgq_after_poll(i->userdata);
}
pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq(pa_rtpoll *p, pa_asyncmsgq *q) {
pa_rtpoll_item *i;
struct pollfd *pollfd;
pa_assert(p);
pa_assert(q);
i = pa_rtpoll_item_new(p, 1);
pollfd = pa_rtpoll_item_get_pollfd(i, NULL);
pollfd->fd = pa_asyncmsgq_get_fd(q);
pollfd->events = POLLIN;
i->before_cb = asyncmsgq_before;
i->after_cb = asyncmsgq_after;
i->userdata = q;
return i;
}