Kaynağa Gözat

Merge pull request 'Use named semaphores' (#32) from saagarjha/snac2:master into master

Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/32

This fixes httpd on macOS. It's fine if you don't want to merge this into snac itself; I can ask MacPorts to carry the patch themselves.
grunfink 3 yıl önce
ebeveyn
işleme
3093bd2315
1 değiştirilmiş dosya ile 9 ekleme ve 5 silme
  1. 9 5
      httpd.c

+ 9 - 5
httpd.c

@@ -299,7 +299,7 @@ void term_handler(int s)
 static pthread_mutex_t job_mutex;
 
 /* semaphre to trigger job processing */
-static sem_t job_sem;
+static sem_t *job_sem;
 
 /* fifo of jobs */
 xs_list *job_fifo = NULL;
@@ -332,7 +332,7 @@ void job_post(const xs_val *job, int urgent)
     }
 
     /* ask for someone to attend it */
-    sem_post(&job_sem);
+    sem_post(job_sem);
 }
 
 
@@ -341,7 +341,7 @@ void job_wait(xs_val **job)
 {
     *job = NULL;
 
-    if (sem_wait(&job_sem) == 0) {
+    if (sem_wait(job_sem) == 0) {
         /* lock the mutex */
         pthread_mutex_lock(&job_mutex);
 
@@ -352,6 +352,10 @@ void job_wait(xs_val **job)
         /* unlock the mutex */
         pthread_mutex_unlock(&job_mutex);
     }
+
+    if (!*job) {
+        sem_close(job_sem);
+    }
 }
 
 
@@ -362,7 +366,7 @@ void job_wait(xs_val **job)
 static void *job_thread(void *arg)
 /* job thread */
 {
-    int pid = (char *) arg - (char *) 0x0;
+    int pid = (int)(uintptr_t)arg;
 
     srv_debug(1, xs_fmt("job thread %d started", pid));
 
@@ -503,7 +507,7 @@ void httpd(void)
 
     /* initialize the job control engine */
     pthread_mutex_init(&job_mutex, NULL);
-    sem_init(&job_sem, 0, 0);
+    job_sem = sem_open("/job", O_CREAT, 0644, 0);
     job_fifo = xs_list_new();
 
     /* initialize sleep control */