monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-12-25 16:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed conflict.

Browse source
This commit is contained in:
default 2023-05-09 17:22:31 +02:00
commit a15ec49a1d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
httpd.c
View file

@ -482,6 +482,7 @@ void httpd(void)
int n_threads = 0;
int n;
time_t start_time = time(NULL);
char sem_name[24];
address = xs_dict_get(srv_config, "address");
port = xs_number_get(xs_dict_get(srv_config, "port"));
@ -507,7 +508,8 @@ void httpd(void)
/* initialize the job control engine */
pthread_mutex_init(&job_mutex, NULL);
job_sem = sem_open("/job", O_CREAT, 0644, 0);
sprintf(sem_name, "/job_%d", getpid());
job_sem = sem_open(sem_name, O_CREAT, 0644, 0);
job_fifo = xs_list_new();
/* initialize sleep control */
@ -567,6 +569,7 @@ void httpd(void)
pthread_mutex_unlock(&job_mutex);
sem_close(job_sem);
sem_unlink(sem_name);
xs *uptime = xs_str_time_diff(time(NULL) - start_time);