From d4979d9403c7478baba2bb3c3bae313ee86ea17a Mon Sep 17 00:00:00 2001 From: default Date: Fri, 10 Feb 2023 11:23:42 +0100 Subject: Added more job_fifo concurrency protections. --- httpd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/httpd.c b/httpd.c index ee1ecb7..a8a6e5f 100644 --- a/httpd.c +++ b/httpd.c @@ -257,7 +257,8 @@ void job_post(const xs_val *job) pthread_mutex_lock(&job_mutex); /* add to the fifo */ - job_fifo = xs_list_append(job_fifo, job); + if (job_fifo != NULL) + job_fifo = xs_list_append(job_fifo, job); /* unlock the mutex */ pthread_mutex_unlock(&job_mutex); @@ -278,7 +279,8 @@ void job_wait(xs_val **job) pthread_mutex_lock(&job_mutex); /* dequeue */ - job_fifo = xs_list_shift(job_fifo, job); + if (job_fifo != NULL) + job_fifo = xs_list_shift(job_fifo, job); /* unlock the mutex */ pthread_mutex_unlock(&job_mutex); @@ -465,7 +467,9 @@ void httpd(void) for (n = 0; n < n_threads; n++) pthread_join(threads[n], NULL); + pthread_mutex_lock(&job_mutex); job_fifo = xs_free(job_fifo); + pthread_mutex_unlock(&job_mutex); srv_log(xs_fmt("httpd stop %s:%d", address, port)); } -- cgit v1.2.3