monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-22 13:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better behaviour on broken queue items.

Browse source
This commit is contained in:
default 2024-01-07 11:13:59 +01:00
parent 3d1f6049e2
commit aa1524be71
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
httpd.c
View file

@ -451,15 +451,18 @@ void job_post(const xs_val *job, int urgent)
job_fifo = xs_list_append(job_fifo, job); job_fifo = xs_list_append(job_fifo, job);
p_stat->job_fifo_size++; p_stat->job_fifo_size++;
srv_debug(2, xs_fmt(
"job_fifo sizes: %d %08x", p_stat->job_fifo_size, xs_size(job_fifo)));
} }
/* unlock the mutex */ /* unlock the mutex */
pthread_mutex_unlock(&job_mutex); pthread_mutex_unlock(&job_mutex);
}
/* ask for someone to attend it */ /* ask for someone to attend it */
sem_post(job_sem); sem_post(job_sem);
} }
}
void job_wait(xs_val **job) void job_wait(xs_val **job)
@ -502,9 +505,12 @@ static void *job_thread(void *arg)
srv_debug(2, xs_fmt("job thread %d wake up", pid)); srv_debug(2, xs_fmt("job thread %d wake up", pid));
if (job == NULL) if (job == NULL) /* corrupted message? */
break; continue;
if (xs_type(job) == XSTYPE_FALSE) /* special message: exit */
break;
else
if (xs_type(job) == XSTYPE_DATA) { if (xs_type(job) == XSTYPE_DATA) {
/* it's a socket */ /* it's a socket */
FILE *f = NULL; FILE *f = NULL;
@ -703,9 +709,9 @@ void httpd(void)
p_stat->srv_running = 0; p_stat->srv_running = 0;
/* send as many empty jobs as working threads */ /* send as many exit jobs as working threads */
for (n = 1; n < p_stat->n_threads; n++) for (n = 1; n < p_stat->n_threads; n++)
job_post(NULL, 0); job_post(xs_stock_false, 0);
/* wait for all the threads to exit */ /* wait for all the threads to exit */
for (n = 0; n < p_stat->n_threads; n++) for (n = 0; n < p_stat->n_threads; n++)

2
xs_version.h
View file

@ -1 +1 @@
/* 3e906b28aaa910cd79dd5eb1d88fda82201d28de 2024-01-04T09:20:12+01:00 */ /* 72caf9fc60c0b90f39a3c62b238d1c9663d109bc 2024-01-07T09:26:08+01:00 */