summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2023-12-26 18:28:43 +0100
committerGravatar default2023-12-26 18:28:43 +0100
commit94a6274a4682e72d1850fd84f1fc7d81c2a460b1 (patch)
tree4fe38c8ed3f4c31d5317165cb575ad49a7945db3
parentReally do what is described in previous commit. (diff)
downloadsnac2-94a6274a4682e72d1850fd84f1fc7d81c2a460b1.tar.gz
snac2-94a6274a4682e72d1850fd84f1fc7d81c2a460b1.tar.xz
snac2-94a6274a4682e72d1850fd84f1fc7d81c2a460b1.zip
Also log the job_fifo len in status.txt.
-rw-r--r--httpd.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/httpd.c b/httpd.c
index 0d52d23..f4cc46c 100644
--- a/httpd.c
+++ b/httpd.c
@@ -32,6 +32,18 @@ int srv_running = 0;
32 32
33time_t srv_start_time = 0; 33time_t srv_start_time = 0;
34 34
35/** job control **/
36
37/* mutex to access the lists of jobs */
38static pthread_mutex_t job_mutex;
39
40/* semaphre to trigger job processing */
41static sem_t *job_sem;
42
43/* fifo of jobs */
44xs_list *job_fifo = NULL;
45
46
35/* nodeinfo 2.0 template */ 47/* nodeinfo 2.0 template */
36const char *nodeinfo_2_0_template = "" 48const char *nodeinfo_2_0_template = ""
37 "{\"version\":\"2.0\"," 49 "{\"version\":\"2.0\","
@@ -219,6 +231,11 @@ int server_get_handler(xs_dict *req, const char *q_path,
219 231
220 xs *uptime = xs_str_time_diff(time(NULL) - srv_start_time); 232 xs *uptime = xs_str_time_diff(time(NULL) - srv_start_time);
221 srv_log(xs_fmt("status: uptime: %s", uptime)); 233 srv_log(xs_fmt("status: uptime: %s", uptime));
234
235 pthread_mutex_lock(&job_mutex);
236 int l = xs_list_len(job_fifo);
237 pthread_mutex_unlock(&job_mutex);
238 srv_log(xs_fmt("status: job_fifo len: %d", l));
222 } 239 }
223 240
224 if (status != 0) 241 if (status != 0)
@@ -417,18 +434,6 @@ void term_handler(int s)
417} 434}
418 435
419 436
420/** job control **/
421
422/* mutex to access the lists of jobs */
423static pthread_mutex_t job_mutex;
424
425/* semaphre to trigger job processing */
426static sem_t *job_sem;
427
428/* fifo of jobs */
429xs_list *job_fifo = NULL;
430
431
432int job_fifo_ready(void) 437int job_fifo_ready(void)
433/* returns true if the job fifo is ready */ 438/* returns true if the job fifo is ready */
434{ 439{