Skip to content

Make keepalive variable local #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
forGGe wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make keepalive variable local #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f2776
Make keepalive variable local
forGGe Apr 13, 2021
4c62b1e
Merge branch 'master' into g88_trying_to_make_keepalive_local
Pithikos Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions thpool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)

static volatile int threads_keepalive;
static volatile int threads_on_hold;
Copy link
Owner

@Pithikos Pithikos Dec 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that if we are to fix this, we should also consider an approach for threads_on_hold

Also some test coverage would be nice demonstrating the original issue and to avoid regression




/* ========================== STRUCTURES ============================ */


Expand Down Expand Up @@ -100,6 +97,7 @@ typedef struct thpool_{
thread** threads; /* pointer to threads */
volatile int num_threads_alive; /* threads currently alive */
volatile int num_threads_working; /* threads currently working */
volatile int keepalive; /* keep pool alive */
pthread_mutex_t thcount_lock; /* used for thread count etc */
pthread_cond_t threads_all_idle; /* signal to thpool_wait */
jobqueue jobqueue; /* job queue */
Expand Down Expand Up @@ -140,7 +138,6 @@ static void bsem_wait(struct bsem *bsem_p);
struct thpool_* thpool_init(int num_threads){

threads_on_hold = 0;
threads_keepalive = 1;

if (num_threads < 0){
num_threads = 0;
Expand All @@ -155,6 +152,7 @@ struct thpool_* thpool_init(int num_threads){
}
thpool_p->num_threads_alive = 0;
thpool_p->num_threads_working = 0;
thpool_p->keepalive =1;

/* Initialise the job queue */
if (jobqueue_init(&thpool_p->jobqueue) == -1){
Expand Down Expand Up @@ -230,7 +228,7 @@ void thpool_destroy(thpool_* thpool_p){
volatile int threads_total = thpool_p->num_threads_alive;

/* End each thread 's infinite loop */
threads_keepalive = 0;
thpool_p->keepalive = 0;

/* Give one second to kill idle threads */
double TIMEOUT = 1.0;
Expand Down Expand Up @@ -368,11 +366,11 @@ static void* thread_do(struct thread* thread_p){
thpool_p->num_threads_alive += 1;
pthread_mutex_unlock(&thpool_p->thcount_lock);

while(threads_keepalive){
while(thpool_p->keepalive){

bsem_wait(thpool_p->jobqueue.has_jobs);

if (threads_keepalive){
if (thpool_p->keepalive){

pthread_mutex_lock(&thpool_p->thcount_lock);
thpool_p->num_threads_working++;
Expand Down