mirrors
/
C-Thread-Pool
mirror of https://github.com/Pithikos/C-Thread-Pool
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move locking inside jobqueue_push and pull

This commit is contained in:
Drew Weymouth 2015-12-21 19:45:06 -08:00
parent 04cf949f9f
commit da2c0fe45e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
thpool.c
View File

@ -178,9 +178,7 @@ int thpool_add_work(thpool_* thpool_p, void *(*function_p)(void*), void* arg_p){
newjob->arg=arg_p; newjob->arg=arg_p;
/* add job to queue */ /* add job to queue */
pthread_mutex_lock(&thpool_p->jobqueue.rwmutex);
jobqueue_push(&thpool_p->jobqueue, newjob); jobqueue_push(&thpool_p->jobqueue, newjob);
pthread_mutex_unlock(&thpool_p->jobqueue.rwmutex);
return 0; return 0;
} }
@ -331,10 +329,7 @@ static void* thread_do(struct thread* thread_p){
/* Read job from queue and execute it */ /* Read job from queue and execute it */
void*(*func_buff)(void* arg); void*(*func_buff)(void* arg);
void* arg_buff; void* arg_buff;
job* job_p; job* job_p = jobqueue_pull(&thpool_p->jobqueue);
pthread_mutex_lock(&thpool_p->jobqueue.rwmutex);
job_p = jobqueue_pull(&thpool_p->jobqueue);
pthread_mutex_unlock(&thpool_p->jobqueue.rwmutex);
if (job_p) { if (job_p) {
func_buff = job_p->function; func_buff = job_p->function;
arg_buff = job_p->arg; arg_buff = job_p->arg;
@ -405,11 +400,10 @@ static void jobqueue_clear(jobqueue* jobqueue_p){
/* Add (allocated) job to queue /* Add (allocated) job to queue
*
* Notice: Caller MUST hold a mutex
*/ */
static void jobqueue_push(jobqueue* jobqueue_p, struct job* newjob){ static void jobqueue_push(jobqueue* jobqueue_p, struct job* newjob){
pthread_mutex_lock(&jobqueue_p->rwmutex);
newjob->prev = NULL; newjob->prev = NULL;
switch(jobqueue_p->len){ switch(jobqueue_p->len){
@ -427,17 +421,16 @@ static void jobqueue_push(jobqueue* jobqueue_p, struct job* newjob){
jobqueue_p->len++; jobqueue_p->len++;
bsem_post(jobqueue_p->has_jobs); bsem_post(jobqueue_p->has_jobs);
pthread_mutex_unlock(&jobqueue_p->rwmutex);
} }
/* Get first job from queue(removes it from queue) /* Get first job from queue(removes it from queue)
*
* Notice: Caller MUST hold a mutex
*/ */
static struct job* jobqueue_pull(jobqueue* jobqueue_p){ static struct job* jobqueue_pull(jobqueue* jobqueue_p){
job* job_p; pthread_mutex_lock(&jobqueue_p->rwmutex);
job_p = jobqueue_p->front; job* job_p = jobqueue_p->front;
switch(jobqueue_p->len){ switch(jobqueue_p->len){
@ -458,6 +451,7 @@ static struct job* jobqueue_pull(jobqueue* jobqueue_p){
} }
pthread_mutex_unlock(&jobqueue_p->rwmutex);
return job_p; return job_p;
} }