hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-12-02 13:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Threads should be put in queue in wait state if we want to add dependencies later

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-14 11:49:50 +02:00
parent e72408249b
commit 38444a81a6
3 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encoder.c
View file

@ -1324,7 +1324,7 @@ static void encoder_state_encode(encoder_state * const main_state) {
for (i=0; main_state->children[i].encoder_control; ++i) { for (i=0; main_state->children[i].encoder_control; ++i) {
//If we don't have wavefronts, parallelize encoding of children. //If we don't have wavefronts, parallelize encoding of children.
if (main_state->children[i].type != ENCODER_STATE_TYPE_WAVEFRONT_ROW) { if (main_state->children[i].type != ENCODER_STATE_TYPE_WAVEFRONT_ROW) {
threadqueue_submit(main_state->encoder_control->threadqueue, worker_encoder_state_encode_children, &(main_state->children[i])); threadqueue_submit(main_state->encoder_control->threadqueue, worker_encoder_state_encode_children, &(main_state->children[i]), 0);
} else { } else {
//Wavefront rows have parallelism at LCU level, so we should not launch multiple threads here! //Wavefront rows have parallelism at LCU level, so we should not launch multiple threads here!
//FIXME: add an assert: we can only have wavefront children //FIXME: add an assert: we can only have wavefront children

23
src/threadqueue.c
View file

@ -285,7 +285,7 @@ int threadqueue_flush(threadqueue_queue * const threadqueue) {
return 1; return 1;
} }
threadqueue_job * threadqueue_submit(threadqueue_queue * const threadqueue, void (*fptr)(void *arg), void *arg) { threadqueue_job * threadqueue_submit(threadqueue_queue * const threadqueue, void (*fptr)(void *arg), void *arg, int wait) {
threadqueue_job *job; threadqueue_job *job;
//No lock here... this should be constant //No lock here... this should be constant
if (threadqueue->threads_count == 0) { if (threadqueue->threads_count == 0) {
@ -293,6 +293,8 @@ threadqueue_job * threadqueue_submit(threadqueue_queue * const threadqueue, void
return NULL; return NULL;
} }
assert(wait == 0 || wait == 1);
job = MALLOC(threadqueue_job, 1); job = MALLOC(threadqueue_job, 1);
if (!job) { if (!job) {
@ -308,7 +310,7 @@ threadqueue_job * threadqueue_submit(threadqueue_queue * const threadqueue, void
assert(0); assert(0);
return NULL; return NULL;
} }
job->ndepends = 0; job->ndepends = wait;
job->rdepends = NULL; job->rdepends = NULL;
job->rdepends_count = 0; job->rdepends_count = 0;
job->rdepends_size = 0; job->rdepends_size = 0;
@ -368,3 +370,20 @@ int threadqueue_job_dep_add(threadqueue_job *job, threadqueue_job *depends_on) {
return 1; return 1;
} }
int threadqueue_job_unwait_job(threadqueue_queue * const threadqueue, threadqueue_job *job) {
PTHREAD_LOCK(&job->lock);
job->ndepends--;
PTHREAD_UNLOCK(&job->lock);
PTHREAD_LOCK(&threadqueue->lock);
//Hope a thread can do it...
if(pthread_cond_signal(&(threadqueue->cond)) != 0) {
fprintf(stderr, "pthread_cond_signal failed!\n");
assert(0);
return 0;
}
PTHREAD_UNLOCK(&threadqueue->lock);
return 1;
}

6
src/threadqueue.h
View file

@ -66,8 +66,10 @@ typedef struct {
//Init a threadqueue //Init a threadqueue
int threadqueue_init(threadqueue_queue * threadqueue, int thread_count); int threadqueue_init(threadqueue_queue * threadqueue, int thread_count);
//Add a job to the queue, and returs a threadqueue_job handle //Add a job to the queue, and returs a threadqueue_job handle. If wait == 1, one has to run threadqueue_job_unwait_job in order to have it run
threadqueue_job * threadqueue_submit(threadqueue_queue * threadqueue, void (*fptr)(void *arg), void *arg); threadqueue_job * threadqueue_submit(threadqueue_queue * threadqueue, void (*fptr)(void *arg), void *arg, int wait);
int threadqueue_job_unwait_job(threadqueue_queue * threadqueue, threadqueue_job *job);
//Add a dependency between two jobs. //Add a dependency between two jobs.
int threadqueue_job_dep_add(threadqueue_job *job, threadqueue_job *depends_on); int threadqueue_job_dep_add(threadqueue_job *job, threadqueue_job *depends_on);