The bug was undetected because it accidentally fell into an error case that slept the correct amount of time. pthread_cond_timedwait takes an absolute time in the future to wait until. The value we were passing was always in the past so it was immediately failing with a TIMEDOUT error code.
120 lines
3.2 KiB
C
120 lines
3.2 KiB
C
/*
|
|
* Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "ff-timer.h"
|
|
|
|
#include <libavutil/time.h>
|
|
#include <time.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
static void *timer_thread(void *opaque)
|
|
{
|
|
struct ff_timer *timer = (struct ff_timer *)opaque;
|
|
int ret;
|
|
|
|
while (true) {
|
|
pthread_mutex_lock(&timer->mutex);
|
|
|
|
if (timer->abort) {
|
|
pthread_mutex_unlock(&timer->mutex);
|
|
break;
|
|
}
|
|
|
|
uint64_t current_time = av_gettime();
|
|
if (current_time < timer->next_wake) {
|
|
struct timespec sleep_time = {
|
|
.tv_sec = timer->next_wake / AV_TIME_BASE,
|
|
.tv_nsec = (timer->next_wake % AV_TIME_BASE)
|
|
* 1000
|
|
};
|
|
|
|
ret = pthread_cond_timedwait(&timer->cond,
|
|
&timer->mutex, &sleep_time);
|
|
if (ret != 0) {
|
|
// failed to wait, just sleep
|
|
av_usleep((unsigned)(timer->next_wake
|
|
- current_time));
|
|
}
|
|
|
|
// we can be woken up merely to set a sooner wake time
|
|
|
|
} else {
|
|
// no new next_wake, sleep until we get something
|
|
av_usleep(1000);
|
|
}
|
|
|
|
// we woke up for some reason
|
|
current_time = av_gettime();
|
|
if (timer->next_wake <= current_time || timer->needs_wake) {
|
|
timer->callback(timer->opaque);
|
|
timer->needs_wake = false;
|
|
}
|
|
|
|
pthread_mutex_unlock(&timer->mutex);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
bool ff_timer_init(struct ff_timer *timer, ff_timer_callback callback,
|
|
void *opaque)
|
|
{
|
|
int ret;
|
|
|
|
memset(timer, 0, sizeof(struct ff_timer));
|
|
timer->abort = false;
|
|
timer->callback = callback;
|
|
timer->opaque = opaque;
|
|
|
|
pthread_mutexattr_init(&timer->mutexattr);
|
|
pthread_mutexattr_settype(&timer->mutexattr, PTHREAD_MUTEX_RECURSIVE);
|
|
pthread_mutex_init(&timer->mutex, &timer->mutexattr);
|
|
pthread_cond_init(&timer->cond, NULL);
|
|
|
|
ret = pthread_create(&timer->timer_thread, NULL, timer_thread, timer);
|
|
return ret == 0;
|
|
}
|
|
|
|
void ff_timer_free(struct ff_timer *timer)
|
|
{
|
|
void *thread_result;
|
|
|
|
assert(timer != NULL);
|
|
|
|
pthread_cancel(timer->timer_thread);
|
|
pthread_join(timer->timer_thread, &thread_result);
|
|
|
|
pthread_mutex_destroy(&timer->mutex);
|
|
pthread_mutexattr_destroy(&timer->mutexattr);
|
|
pthread_cond_destroy(&timer->cond);
|
|
}
|
|
|
|
void ff_timer_schedule(struct ff_timer *timer, uint64_t microseconds)
|
|
{
|
|
uint64_t cur_time = av_gettime();
|
|
uint64_t new_wake_time = cur_time + microseconds;
|
|
|
|
pthread_mutex_lock(&timer->mutex);
|
|
|
|
timer->needs_wake = true;
|
|
if (new_wake_time < timer->next_wake || cur_time > timer->next_wake)
|
|
timer->next_wake = new_wake_time;
|
|
|
|
pthread_cond_signal(&timer->cond);
|
|
|
|
pthread_mutex_unlock(&timer->mutex);
|
|
}
|