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

Use pa_read, pa_write and pa_poll instead of system functions

Browse source
This commit is contained in:
Maarten Bosmans 2011-01-05 19:50:44 +01:00
parent 30c7c95184
commit 821562b9bc
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/cpulimit.c
View file

@ -140,7 +140,7 @@ static void signal_handler(int sig) {
write_err("Soft CPU time limit exhausted, terminating.\n"); write_err("Soft CPU time limit exhausted, terminating.\n");
/* Try a soft cleanup */ /* Try a soft cleanup */
(void) write(the_pipe[1], &c, sizeof(c)); (void) pa_write(the_pipe[1], &c, sizeof(c), NULL);
phase = PHASE_SOFT; phase = PHASE_SOFT;
reset_cpu_time(CPUTIME_INTERVAL_HARD); reset_cpu_time(CPUTIME_INTERVAL_HARD);

2
src/pulse/thread-mainloop.c
View file

@ -67,7 +67,7 @@ static int poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, void
* avahi_simple_poll_quit() can succeed from another thread. */ * avahi_simple_poll_quit() can succeed from another thread. */
pa_mutex_unlock(mutex); pa_mutex_unlock(mutex);
r = poll(ufds, nfds, timeout); r = pa_poll(ufds, nfds, timeout);
pa_mutex_lock(mutex); pa_mutex_lock(mutex);
return r; return r;

18
src/pulsecore/fdsem.c
View file

@ -154,7 +154,7 @@ static void flush(pa_fdsem *f) {
if (f->efd >= 0) { if (f->efd >= 0) {
uint64_t u; uint64_t u;
if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) { if ((r = pa_read(f->efd, &u, sizeof(u), NULL)) != sizeof(u)) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from eventfd: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid read from eventfd: %s", r < 0 ? pa_cstrerror(errno) : "EOF");
@ -167,7 +167,7 @@ static void flush(pa_fdsem *f) {
} else } else
#endif #endif
if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) { if ((r = pa_read(f->fds[0], &x, sizeof(x), NULL)) <= 0) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF");
@ -197,9 +197,9 @@ void pa_fdsem_post(pa_fdsem *f) {
if (f->efd >= 0) { if (f->efd >= 0) {
uint64_t u = 1; uint64_t u = 1;
if ((r = write(f->efd, &u, sizeof(u))) != sizeof(u)) { if ((r = pa_write(f->efd, &u, sizeof(u), NULL)) != sizeof(u)) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid write to eventfd: %s", r < 0 ? pa_cstrerror(errno) : "EOF");
pa_assert_not_reached(); pa_assert_not_reached();
} }
@ -208,9 +208,9 @@ void pa_fdsem_post(pa_fdsem *f) {
} else } else
#endif #endif
if ((r = write(f->fds[1], &x, 1)) != 1) { if ((r = pa_write(f->fds[1], &x, 1, NULL)) != 1) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid write to pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF");
pa_assert_not_reached(); pa_assert_not_reached();
} }
@ -241,10 +241,10 @@ void pa_fdsem_wait(pa_fdsem *f) {
if (f->efd >= 0) { if (f->efd >= 0) {
uint64_t u; uint64_t u;
if ((r = read(f->efd, &u, sizeof(u))) != sizeof(u)) { if ((r = pa_read(f->efd, &u, sizeof(u), NULL)) != sizeof(u)) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid read from eventfd: %s", r < 0 ? pa_cstrerror(errno) : "EOF");
pa_assert_not_reached(); pa_assert_not_reached();
} }
@ -255,7 +255,7 @@ void pa_fdsem_wait(pa_fdsem *f) {
} else } else
#endif #endif
if ((r = read(f->fds[0], &x, sizeof(x))) <= 0) { if ((r = pa_read(f->fds[0], &x, sizeof(x), NULL)) <= 0) {
if (r >= 0 || errno != EINTR) { if (r >= 0 || errno != EINTR) {
pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF"); pa_log_error("Invalid read from pipe: %s", r < 0 ? pa_cstrerror(errno) : "EOF");

6
src/pulsecore/lock-autospawn.c
View file

@ -161,7 +161,7 @@ static void ping(void) {
for (;;) { for (;;) {
char x = 'x'; char x = 'x';
if ((s = write(pipe_fd[1], &x, 1)) == 1) if ((s = pa_write(pipe_fd[1], &x, 1, NULL)) == 1)
break; break;
pa_assert(s < 0); pa_assert(s < 0);
@ -188,7 +188,7 @@ static void wait_for_ping(void) {
if ((k = pa_poll(&pfd, 1, -1)) != 1) { if ((k = pa_poll(&pfd, 1, -1)) != 1) {
pa_assert(k < 0); pa_assert(k < 0);
pa_assert(errno == EINTR); pa_assert(errno == EINTR);
} else if ((s = read(pipe_fd[0], &x, 1)) != 1) { } else if ((s = pa_read(pipe_fd[0], &x, 1, NULL)) != 1) {
pa_assert(s < 0); pa_assert(s < 0);
pa_assert(errno == EAGAIN); pa_assert(errno == EAGAIN);
} }
@ -200,7 +200,7 @@ static void empty_pipe(void) {
pa_assert(pipe_fd[0] >= 0); pa_assert(pipe_fd[0] >= 0);
if ((s = read(pipe_fd[0], &x, sizeof(x))) < 1) { if ((s = pa_read(pipe_fd[0], &x, sizeof(x), NULL)) < 1) {
pa_assert(s < 0); pa_assert(s < 0);
pa_assert(errno == EAGAIN); pa_assert(errno == EAGAIN);
} }