Use Linux eventfd() if kernel supports it

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1908 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-26 22:50:08 +00:00
parent e99bc33bcb
commit 008c709900

View file

@ -25,6 +25,7 @@
#include <config.h>
#endif
#include <sys/syscall.h>
#include <unistd.h>
#include <errno.h>
@ -35,10 +36,37 @@
#include <pulsecore/core-util.h>
#include <pulse/xmalloc.h>
#ifdef __linux__
#if !defined(__NR_eventfd) && defined(__i386__)
#define __NR_eventfd 323
#endif
#if !defined(__NR_eventfd) && defined(__x86_64__)
#define __NR_eventfd 284
#endif
#if !defined(SYS_eventfd) && defined(__NR_eventfd)
#define SYS_eventfd __NR_eventfd
#endif
#ifdef SYS_eventfd
#define HAVE_EVENTFD
static inline long eventfd(unsigned count) {
return syscall(SYS_eventfd, count);
}
#endif
#endif
#include "fdsem.h"
struct pa_fdsem {
int fds[2];
#ifdef HAVE_EVENTFD
int efd;
#endif
pa_atomic_t waiting;
pa_atomic_t signalled;
pa_atomic_t in_pipe;
@ -49,6 +77,14 @@ pa_fdsem *pa_fdsem_new(void) {
f = pa_xnew(pa_fdsem, 1);
#ifdef HAVE_EVENTFD
if ((f->efd = eventfd(0)) >= 0) {
pa_make_fd_cloexec(f->efd);
f->fds[0] = f->fds[1] = -1;
} else
#endif
{
if (pipe(f->fds) < 0) {
pa_xfree(f);
return NULL;
@ -56,6 +92,7 @@ pa_fdsem *pa_fdsem_new(void) {
pa_make_fd_cloexec(f->fds[0]);
pa_make_fd_cloexec(f->fds[1]);
}
pa_atomic_store(&f->waiting, 0);
pa_atomic_store(&f->signalled, 0);
@ -67,6 +104,10 @@ pa_fdsem *pa_fdsem_new(void) {
void pa_fdsem_free(pa_fdsem *f) {
pa_assert(f);
#ifdef HAVE_EVENTFD
if (f->efd >= 0)
pa_close(f->efd);
#endif
pa_close_pipe(f->fds);
pa_xfree(f);
@ -82,6 +123,18 @@ static void flush(pa_fdsem *f) {
do {
char x[10];
#ifdef HAVE_EVENTFD
if (f->efd >= 0) {
uint64_t u;
if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) {
pa_assert(r < 0 && errno == EINTR);
continue;
}
r = (ssize_t) u;
} else
#endif
if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) {
pa_assert(r < 0 && errno == EINTR);
continue;
@ -103,6 +156,17 @@ void pa_fdsem_post(pa_fdsem *f) {
for (;;) {
#ifdef HAVE_EVENTFD
if (f->efd >= 0) {
uint64_t u = 1;
if ((r = write(f->efd, &u, sizeof(u))) != sizeof(u)) {
pa_assert(r < 0 && errno == EINTR);
continue;
}
} else
#endif
if ((r = write(f->fds[1], &x, 1)) != 1) {
pa_assert(r < 0 && errno == EINTR);
continue;
@ -128,6 +192,19 @@ void pa_fdsem_wait(pa_fdsem *f) {
char x[10];
ssize_t r;
#ifdef HAVE_EVENTFD
if (f->efd >= 0) {
uint64_t u;
if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) {
pa_assert(r < 0 && errno == EINTR);
continue;
}
r = (ssize_t) u;
} else
#endif
if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) {
pa_assert(r < 0 && errno == EINTR);
continue;
@ -150,10 +227,14 @@ int pa_fdsem_try(pa_fdsem *f) {
return 0;
}
int pa_fdsem_get(pa_fdsem *f) {
pa_assert(f);
#ifdef HAVE_EVENTFD
if (f->efd >= 0)
return f->efd;
#endif
return f->fds[0];
}