threads: fix function name

Closer to the corresponding standard function pthread_cond_timedwait.
This commit is contained in:
wm4 2014-04-23 20:56:25 +02:00
parent 80ff94131b
commit cd10af4db6
4 changed files with 7 additions and 7 deletions

View File

@ -198,7 +198,7 @@ void mp_dispatch_queue_process(struct mp_dispatch_queue *queue, double timeout)
} }
} else { } else {
if (timeout > 0) { if (timeout > 0) {
mpthread_cond_timed_wait(&queue->cond, &queue->lock, timeout); mpthread_cond_timedwait(&queue->cond, &queue->lock, timeout);
} else { } else {
pthread_cond_wait(&queue->cond, &queue->lock); pthread_cond_wait(&queue->cond, &queue->lock);
} }

View File

@ -62,8 +62,8 @@ struct timespec mpthread_get_deadline(double timeout)
} }
// Call pthread_cond_timedwait() with a relative timeout in seconds // Call pthread_cond_timedwait() with a relative timeout in seconds
int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex, int mpthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
double timeout) double timeout)
{ {
struct timespec ts = mpthread_get_deadline(timeout); struct timespec ts = mpthread_get_deadline(timeout);
return pthread_cond_timedwait(cond, mutex, &ts); return pthread_cond_timedwait(cond, mutex, &ts);

View File

@ -5,8 +5,8 @@
struct timespec mpthread_get_deadline(double timeout); struct timespec mpthread_get_deadline(double timeout);
int mpthread_cond_timed_wait(pthread_cond_t *cond, pthread_mutex_t *mutex, int mpthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
double timeout); double timeout);
int mpthread_mutex_init_recursive(pthread_mutex_t *mutex); int mpthread_mutex_init_recursive(pthread_mutex_t *mutex);

View File

@ -167,7 +167,7 @@ static int cache_wakeup_and_wait(struct priv *s, double *retry_time)
} }
pthread_cond_signal(&s->wakeup); pthread_cond_signal(&s->wakeup);
mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME); mpthread_cond_timedwait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
*retry_time += mp_time_sec() - start; *retry_time += mp_time_sec() - start;
@ -529,7 +529,7 @@ static void *cache_thread(void *arg)
s->control = CACHE_CTRL_NONE; s->control = CACHE_CTRL_NONE;
} }
if (s->idle && s->control == CACHE_CTRL_NONE) if (s->idle && s->control == CACHE_CTRL_NONE)
mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME); mpthread_cond_timedwait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
} }
pthread_cond_signal(&s->wakeup); pthread_cond_signal(&s->wakeup);
pthread_mutex_unlock(&s->mutex); pthread_mutex_unlock(&s->mutex);