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

make sure to clear all queued RT signals before arm a new timer

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2265 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-04-14 18:43:59 +00:00
parent 04178d428e
commit 6946d2ad2d
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulsecore/rtpoll.c
View file

@ -462,9 +462,22 @@ static void update_timer(pa_rtpoll *p) {
if (p->timer != (timer_t) -1) { if (p->timer != (timer_t) -1) {
struct itimerspec its; struct itimerspec its;
memset(&its, 0, sizeof(its)); struct timespec ts = { .tv_sec = 0, .tv_nsec = 0 };
sigset_t ss;
/* First disarm timer */
memset(&its, 0, sizeof(its));
pa_assert_se(timer_settime(p->timer, TIMER_ABSTIME, &its, NULL) == 0);
/* Remove a signal that might be waiting in the signal q */
pa_assert_se(sigemptyset(&ss) == 0);
pa_assert_se(sigaddset(&ss, p->rtsig) == 0);
sigtimedwait(&ss, NULL, &ts);
/* And install the new timer */
if (p->timer_enabled) { if (p->timer_enabled) {
memset(&its, 0, sizeof(its));
its.it_value.tv_sec = p->next_elapse.tv_sec; its.it_value.tv_sec = p->next_elapse.tv_sec;
its.it_value.tv_nsec = p->next_elapse.tv_usec*1000; its.it_value.tv_nsec = p->next_elapse.tv_usec*1000;
@ -472,9 +485,8 @@ static void update_timer(pa_rtpoll *p) {
* "disarming" */ * "disarming" */
if (its.it_value.tv_sec == 0 && its.it_value.tv_nsec == 0) if (its.it_value.tv_sec == 0 && its.it_value.tv_nsec == 0)
its.it_value.tv_nsec = 1; its.it_value.tv_nsec = 1;
pa_assert_se(timer_settime(p->timer, TIMER_ABSTIME, &its, NULL) == 0);
} }
pa_assert_se(timer_settime(p->timer, TIMER_ABSTIME, &its, NULL) == 0);
} }
#ifdef __linux__ #ifdef __linux__