mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mainloop: Remove redundant wakeup_pipe validity checks.

Browse source 
The pipe is opened when creating the mainloop and closed
when freeing the mainloop. The pipe fds can never be less
than zero.
This commit is contained in:
Tanu Kaskinen 2012-04-02 15:01:04 +03:00 • committed by Tanu Kaskinen
parent 31d905aaae
commit 7e94a03e0c
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pulse/mainloop.c
View file

@ -611,13 +611,11 @@ static void rebuild_pollfds(pa_mainloop *m) {
m->n_pollfds = 0;
p = m->pollfds;
if (m->wakeup_pipe[0] >= 0) {
m->pollfds[0].fd = m->wakeup_pipe[0];
m->pollfds[0].events = POLLIN;
m->pollfds[0].revents = 0;
p++;
m->n_pollfds++;
}
m->pollfds[0].fd = m->wakeup_pipe[0];
m->pollfds[0].events = POLLIN;
m->pollfds[0].revents = 0;
p++;
m->n_pollfds++;
PA_LLIST_FOREACH(e, m->io_events) {
if (e->dead) {
@ -772,10 +770,8 @@ void pa_mainloop_wakeup(pa_mainloop *m) {
char c = 'W';
pa_assert(m);
if (m->wakeup_pipe[1] >= 0) {
pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type);
pa_atomic_store(&m->wakeup_requested, TRUE);
}
pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type);
pa_atomic_store(&m->wakeup_requested, TRUE);
}
static void clear_wakeup(pa_mainloop *m) {
@ -783,9 +779,6 @@ static void clear_wakeup(pa_mainloop *m) {
pa_assert(m);
if (m->wakeup_pipe[0] < 0)
return;
if (pa_atomic_cmpxchg(&m->wakeup_requested, TRUE, FALSE)) {
while (pa_read(m->wakeup_pipe[0], &c, sizeof(c), &m->wakeup_pipe_type) == sizeof(c))
;