summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2016-08-26 17:41:20 +0200
committerJean Guyomarc'h <jean@guyomarch.bzh>2016-08-26 19:43:17 +0200
commit49cc1ce100ba50363bdb425cad5eb53b668d627f (patch)
treed38fef84a5d7a568676c099878688e452ba5a745
parent6b3ca899e8a60642466ddb6d7c7574b0c3ad9d9c (diff)
downloadefl-49cc1ce100ba50363bdb425cad5eb53b668d627f.tar.gz
eina: overhaul Mac OS X semaphores
Mac OS X does not support POSIX unnamed semaphores, only named semaphores, which are persistant IPC: when the program exits, and if semaphores where not released, they stay forever... All EFL programs were "leaking" a semaphore, due to how eina_log_monitor manages its resources. Therefore, after building EFL a lot (which run eolian_gen, eolian_cxx, elua, edje_cc, ...) we were not able to create any semaphore... Now, we get rid of these semaphores and use Mac OS X's own semaphores. Code is less cumbersome, and we don't have any disavantage of the named semaphores. Fixes T4423 @fix
-rw-r--r--src/lib/eina/eina_inline_lock_posix.x34
1 files changed, 13 insertions, 21 deletions
diff --git a/src/lib/eina/eina_inline_lock_posix.x b/src/lib/eina/eina_inline_lock_posix.x
index b52a6473bf..d2e4b95952 100644
--- a/src/lib/eina/eina_inline_lock_posix.x
+++ b/src/lib/eina/eina_inline_lock_posix.x
@@ -42,6 +42,10 @@
# include <libkern/OSAtomic.h>
#endif
+#ifdef EINA_HAVE_OSX_SEMAPHORE
+# include <mach/mach.h>
+#endif
+
#include <semaphore.h>
#include <sys/time.h>
@@ -94,15 +98,7 @@ typedef Eina_Lock Eina_Spinlock;
#endif
#if defined(EINA_HAVE_OSX_SEMAPHORE)
-/* OSX supports only named semaphores.
- * So, we need to be able to generate a unique string identifier for each
- * semaphore we want to create. */
-struct _Eina_Semaphore
-{
- sem_t *sema;
- char name[32];
-};
-typedef struct _Eina_Semaphore Eina_Semaphore;
+typedef semaphore_t Eina_Semaphore;
#else
typedef sem_t Eina_Semaphore;
#endif
@@ -838,13 +834,10 @@ eina_semaphore_new(Eina_Semaphore *sem, int count_init)
return EINA_FALSE;
#if defined(EINA_HAVE_OSX_SEMAPHORE)
- /* Atomic increment to generate the unique identifier */
- snprintf(sem->name, sizeof(sem->name), "/eina%x%x%x",
- (unsigned int)getpid(), (unsigned int)rand(), (unsigned int)rand());
- sem->name[sizeof(sem->name) - 1] = '\0';
- sem_unlink(sem->name);
- sem->sema = sem_open(sem->name, O_CREAT | O_EXCL, 0600, count_init);
- return (sem->sema == SEM_FAILED) ? EINA_FALSE : EINA_TRUE;
+ kern_return_t kr;
+
+ kr = semaphore_create(mach_task_self(), sem, SYNC_POLICY_FIFO, count_init);
+ return (kr == KERN_SUCCESS) ? EINA_TRUE : EINA_FALSE;
#else
return (sem_init(sem, 0, count_init) == 0) ? EINA_TRUE : EINA_FALSE;
#endif
@@ -857,9 +850,8 @@ eina_semaphore_free(Eina_Semaphore *sem)
return EINA_FALSE;
#if defined(EINA_HAVE_OSX_SEMAPHORE)
- const int closed = sem_close(sem->sema);
- const int unlinked = sem_unlink(sem->name);
- return ((closed == 0) && (unlinked == 0)) ? EINA_TRUE : EINA_FALSE;
+ return (semaphore_destroy(*sem, mach_task_self()) == KERN_SUCCESS)
+ ? EINA_TRUE : EINA_FALSE;
#else
return (sem_destroy(sem) == 0) ? EINA_TRUE : EINA_FALSE;
#endif
@@ -877,7 +869,7 @@ eina_semaphore_lock(Eina_Semaphore *sem)
{
if (
#if defined(EINA_HAVE_OSX_SEMAPHORE)
- sem_wait(sem->sema)
+ semaphore_wait(*sem)
#else
sem_wait(sem)
#endif
@@ -906,7 +898,7 @@ eina_semaphore_release(Eina_Semaphore *sem, int count_release EINA_UNUSED)
return EINA_FALSE;
#if defined(EINA_HAVE_OSX_SEMAPHORE)
- return (sem_post(sem->sema) == 0) ? EINA_TRUE : EINA_FALSE;
+ return (semaphore_signal(*sem) == KERN_SUCCESS) ? EINA_TRUE : EINA_FALSE;
#else
return (sem_post(sem) == 0) ? EINA_TRUE : EINA_FALSE;
#endif