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

Change worker return type to void; add extern C 

1. Worker return type void* is not handled, changing to void. 
2. Added extern "C" clause to help in C++ integration.
This commit is contained in:
bowfin 2016-09-04 00:17:18 -04:00 committed by GitHub
parent dacf776a00
commit 52552779cc
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
thpool.c
View File

@ -45,7 +45,7 @@ typedef struct bsem {
/* Job */
typedef struct job{
struct job* prev; /* pointer to previous job */
void* (*function)(void* arg); /* function pointer */
void (*function)(void* arg); /* function pointer */
void* arg; /* function's argument */
} job;
@ -165,7 +165,7 @@ struct thpool_* thpool_init(int num_threads){
/* Add work to the thread pool */
int thpool_add_work(thpool_* thpool_p, void *(*function_p)(void*), void* arg_p){
int thpool_add_work(thpool_* thpool_p, void (*function_p)(void*), void* arg_p){
job* newjob;
newjob=(struct job*)malloc(sizeof(struct job));
@ -342,8 +342,8 @@ static void* thread_do(struct thread* thread_p){
pthread_mutex_unlock(&thpool_p->thcount_lock);
/* Read job from queue and execute it */
void*(*func_buff)(void* arg);
void* arg_buff;
void (*func_buff)(void* arg);
void* arg_buff;
job* job_p;
pthread_mutex_lock(&thpool_p->jobqueue_p->rwmutex);
job_p = jobqueue_pull(thpool_p);

13
thpool.h
View File

@ -7,9 +7,9 @@
#ifndef _THPOOL_
#define _THPOOL_
#ifdef __cplusplus
extern "C" {
#endif
/* =================================== API ======================================= */
@ -64,7 +64,7 @@ threadpool thpool_init(int num_threads);
* @param arg_p pointer to an argument
* @return 0 on successs, -1 otherwise.
*/
int thpool_add_work(threadpool, void *(*function_p)(void*), void* arg_p);
int thpool_add_work(threadpool, void (*function_p)(void*), void* arg_p);
/**
@ -158,7 +158,8 @@ void thpool_resume(threadpool);
*/
void thpool_destroy(threadpool);
#ifdef __cplusplus
}
#endif
#endif