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

drop support for periodic timers, cleanup code a bit

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2217 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-04-04 16:05:15 +00:00
parent 122861f75e
commit 064aa1243c
2 changed files with 6 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/pulsecore/rtpoll.c
View file

@ -63,7 +63,6 @@ struct pa_rtpoll {
pa_bool_t timer_enabled; pa_bool_t timer_enabled;
struct timeval next_elapse; struct timeval next_elapse;
pa_usec_t period;
pa_bool_t scan_for_dead; pa_bool_t scan_for_dead;
pa_bool_t running, installed, rebuild_needed, quit; pa_bool_t running, installed, rebuild_needed, quit;
@ -139,7 +138,6 @@ pa_rtpoll *pa_rtpoll_new(void) {
p->pollfd2 = pa_xnew(struct pollfd, p->n_pollfd_alloc); p->pollfd2 = pa_xnew(struct pollfd, p->n_pollfd_alloc);
p->n_pollfd_used = 0; p->n_pollfd_used = 0;
p->period = 0;
memset(&p->next_elapse, 0, sizeof(p->next_elapse)); memset(&p->next_elapse, 0, sizeof(p->next_elapse));
p->timer_enabled = FALSE; p->timer_enabled = FALSE;
@ -368,15 +366,13 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait) {
if (p->rebuild_needed) if (p->rebuild_needed)
rtpoll_rebuild(p); rtpoll_rebuild(p);
memset(&timeout, 0, sizeof(timeout));
/* Calculate timeout */ /* Calculate timeout */
if (!wait || p->quit) { if (wait && !p->quit && p->timer_enabled) {
timeout.tv_sec = 0;
timeout.tv_usec = 0;
} else if (p->timer_enabled) {
struct timeval now; struct timeval now;
pa_rtclock_get(&now); pa_rtclock_get(&now);
memset(&timeout, 0, sizeof(timeout));
if (pa_timeval_cmp(&p->next_elapse, &now) > 0) if (pa_timeval_cmp(&p->next_elapse, &now) > 0)
pa_timeval_add(&timeout, pa_timeval_diff(&p->next_elapse, &now)); pa_timeval_add(&timeout, pa_timeval_diff(&p->next_elapse, &now));
} }
@ -391,14 +387,14 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait) {
struct timespec ts; struct timespec ts;
ts.tv_sec = timeout.tv_sec; ts.tv_sec = timeout.tv_sec;
ts.tv_nsec = timeout.tv_usec * 1000; ts.tv_nsec = timeout.tv_usec * 1000;
r = ppoll(p->pollfd, p->n_pollfd_used, p->timer_enabled ? &ts : NULL, p->rtsig < 0 ? NULL : &p->sigset_unblocked); r = ppoll(p->pollfd, p->n_pollfd_used, (!wait || p->quit || p->timer_enabled) ? &ts : NULL, p->rtsig < 0 ? NULL : &p->sigset_unblocked);
} }
#ifdef __linux__ #ifdef __linux__
else else
#endif #endif
#endif #endif
r = poll(p->pollfd, p->n_pollfd_used, p->timer_enabled ? (timeout.tv_sec*1000) + (timeout.tv_usec / 1000) : -1); r = poll(p->pollfd, p->n_pollfd_used, (!wait || p->quit || p->timer_enabled) ? (timeout.tv_sec*1000) + (timeout.tv_usec / 1000) : -1);
if (r < 0) { if (r < 0) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
@ -409,21 +405,6 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait) {
reset_all_revents(p); reset_all_revents(p);
} }
if (p->timer_enabled) {
if (p->period > 0) {
struct timeval now;
pa_rtclock_get(&now);
pa_timeval_add(&p->next_elapse, p->period);
/* Guarantee that the next timeout will happen in the future */
if (pa_timeval_cmp(&p->next_elapse, &now) < 0)
pa_timeval_add(&p->next_elapse, (pa_timeval_diff(&now, &p->next_elapse) / p->period + 1) * p->period);
} else
p->timer_enabled = FALSE;
}
/* Let's tell everyone that we left the sleep */ /* Let's tell everyone that we left the sleep */
for (i = p->items; i && i->priority < PA_RTPOLL_NEVER; i = i->next) { for (i = p->items; i && i->priority < PA_RTPOLL_NEVER; i = i->next) {
@ -489,15 +470,8 @@ static void update_timer(pa_rtpoll *p) {
/* Make sure that 0,0 is not understood as /* Make sure that 0,0 is not understood as
* "disarming" */ * "disarming" */
if (its.it_value.tv_sec == 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;
if (p->period > 0) {
struct timeval tv;
pa_timeval_store(&tv, p->period);
its.it_interval.tv_sec = tv.tv_sec;
its.it_interval.tv_nsec = tv.tv_usec*1000;
}
} }
pa_assert_se(timer_settime(p->timer, TIMER_ABSTIME, &its, NULL) == 0); pa_assert_se(timer_settime(p->timer, TIMER_ABSTIME, &its, NULL) == 0);
@ -515,18 +489,6 @@ void pa_rtpoll_set_timer_absolute(pa_rtpoll *p, const struct timeval *ts) {
pa_assert(ts); pa_assert(ts);
p->next_elapse = *ts; p->next_elapse = *ts;
p->period = 0;
p->timer_enabled = TRUE;
update_timer(p);
}
void pa_rtpoll_set_timer_periodic(pa_rtpoll *p, pa_usec_t usec) {
pa_assert(p);
p->period = usec;
pa_rtclock_get(&p->next_elapse);
pa_timeval_add(&p->next_elapse, usec);
p->timer_enabled = TRUE; p->timer_enabled = TRUE;
update_timer(p); update_timer(p);
@ -535,7 +497,6 @@ void pa_rtpoll_set_timer_periodic(pa_rtpoll *p, pa_usec_t usec) {
void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec) { void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec) {
pa_assert(p); pa_assert(p);
p->period = 0;
pa_rtclock_get(&p->next_elapse); pa_rtclock_get(&p->next_elapse);
pa_timeval_add(&p->next_elapse, usec); pa_timeval_add(&p->next_elapse, usec);
p->timer_enabled = TRUE; p->timer_enabled = TRUE;
@ -546,7 +507,6 @@ void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec) {
void pa_rtpoll_set_timer_disabled(pa_rtpoll *p) { void pa_rtpoll_set_timer_disabled(pa_rtpoll *p) {
pa_assert(p); pa_assert(p);
p->period = 0;
memset(&p->next_elapse, 0, sizeof(p->next_elapse)); memset(&p->next_elapse, 0, sizeof(p->next_elapse));
p->timer_enabled = FALSE; p->timer_enabled = FALSE;

1
src/pulsecore/rtpoll.h
View file

@ -75,7 +75,6 @@ void pa_rtpoll_install(pa_rtpoll *p);
int pa_rtpoll_run(pa_rtpoll *f, pa_bool_t wait); int pa_rtpoll_run(pa_rtpoll *f, pa_bool_t wait);
void pa_rtpoll_set_timer_absolute(pa_rtpoll *p, const struct timeval *ts); void pa_rtpoll_set_timer_absolute(pa_rtpoll *p, const struct timeval *ts);
void pa_rtpoll_set_timer_periodic(pa_rtpoll *p, pa_usec_t usec);
void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec); void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec);
void pa_rtpoll_set_timer_disabled(pa_rtpoll *p); void pa_rtpoll_set_timer_disabled(pa_rtpoll *p);