From c8d866a25aa0499fa084074ebdc59c24ef9f2449 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 15 Oct 2018 16:40:57 +0000 Subject: Use GCD semaphore on macOS Unnamed POSIX semaphore doesn't work on macOS --- common/threads.c | 35 +++++++++++++++++++++++++++++++++++ common/threads.h | 8 ++++++++ 2 files changed, 43 insertions(+) (limited to 'common') diff --git a/common/threads.c b/common/threads.c index 6cfe383b..e8301297 100644 --- a/common/threads.c +++ b/common/threads.c @@ -631,6 +631,39 @@ void alcnd_destroy(alcnd_t *cond) } +#ifdef __APPLE__ + +int alsem_init(alsem_t *sem, unsigned int initial) +{ + *sem = dispatch_semaphore_create(initial); + return *sem ? althrd_success : althrd_error; +} + +void alsem_destroy(alsem_t *sem) +{ + dispatch_release(*sem); +} + +int alsem_post(alsem_t *sem) +{ + dispatch_semaphore_signal(*sem); + return althrd_success; +} + +int alsem_wait(alsem_t *sem) +{ + dispatch_semaphore_wait(*sem, DISPATCH_TIME_FOREVER); + return althrd_success; +} + +int alsem_trywait(alsem_t *sem) +{ + long value = dispatch_semaphore_wait(*sem, DISPATCH_TIME_NOW); + return value == 0 ? althrd_success : althrd_busy; +} + +#else /* !__APPLE__ */ + int alsem_init(alsem_t *sem, unsigned int initial) { if(sem_init(sem, 0, initial) == 0) @@ -665,6 +698,8 @@ int alsem_trywait(alsem_t *sem) return althrd_error; } +#endif /* __APPLE__ */ + int altss_create(altss_t *tss_id, altss_dtor_t callback) { diff --git a/common/threads.h b/common/threads.h index b0bebd8d..2d1b4e7f 100644 --- a/common/threads.h +++ b/common/threads.h @@ -130,13 +130,21 @@ inline int altss_set(altss_t tss_id, void *val) #include #include #include +#ifdef __APPLE__ +#include +#else /* !__APPLE__ */ #include +#endif /* __APPLE__ */ typedef pthread_t althrd_t; typedef pthread_mutex_t almtx_t; typedef pthread_cond_t alcnd_t; +#ifdef __APPLE__ +typedef dispatch_semaphore_t alsem_t; +#else /* !__APPLE__ */ typedef sem_t alsem_t; +#endif /* __APPLE__ */ typedef pthread_key_t altss_t; typedef pthread_once_t alonce_flag; -- cgit v1.2.3