Browse Source

pthread: Fix deadlock during thread initialization

Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n2.1
Derek Buitenhuis 12 years ago
parent
commit
eb90a2091f
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      libavcodec/pthread.c
  2. +2
    -1
      libavfilter/pthread.c

+ 2
- 1
libavcodec/pthread.c View File

@@ -152,7 +152,8 @@ static void* attribute_align_arg worker(void *v)
if (c->current_job == thread_count + c->job_count)
pthread_cond_signal(&c->last_job_cond);

pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
if (!c->done)
pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
our_job = self_id;

if (c->done) {


+ 2
- 1
libavfilter/pthread.c View File

@@ -73,7 +73,8 @@ static void* attribute_align_arg worker(void *v)
if (c->current_job == nb_threads + c->nb_jobs)
pthread_cond_signal(&c->last_job_cond);

pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
if (!c->done)
pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
our_job = self_id;

if (c->done) {


Loading…
Cancel
Save