# include <unistd.h> /* _POSIX_SPIN_LOCKS */
# include <pthread.h>
-# include <semaphore.h>
+
+/* Unnamed POSIX semaphores not supported on Mac OS X, use Mach semaphores instead */
+# if defined (__APPLE__)
+# include <mach/semaphore.h>
+# include <mach/task.h>
+# else
+# include <semaphore.h>
+# endif
#endif
#define VLC_STATIC_MUTEX PTHREAD_MUTEX_INITIALIZER
typedef pthread_cond_t vlc_cond_t;
#define VLC_STATIC_COND PTHREAD_COND_INITIALIZER
-typedef sem_t vlc_sem_t;
typedef pthread_rwlock_t vlc_rwlock_t;
typedef pthread_key_t vlc_threadvar_t;
typedef struct vlc_timer *vlc_timer_t;
+#if defined (__APPLE__)
+typedef semaphore_t vlc_sem_t;
+#else
+typedef sem_t vlc_sem_t;
+#endif
+
#elif defined( WIN32 )
#if !defined( UNDER_CE )
typedef HANDLE vlc_thread_t;
#ifdef __APPLE__
# include <sys/time.h> /* gettimeofday in vlc_cond_timedwait */
+# include <mach/mach_init.h> /* mach_task_self in semaphores */
#endif
/**
*/
void vlc_sem_init (vlc_sem_t *sem, unsigned value)
{
+#if defined(__APPLE__)
+ if (unlikely(semaphore_create(mach_task_self(), sem, SYNC_POLICY_FIFO, value) != KERN_SUCCESS))
+ abort ();
+#else
if (unlikely(sem_init (sem, 0, value)))
abort ();
+#endif
}
/**
*/
void vlc_sem_destroy (vlc_sem_t *sem)
{
+ int val;
+
+#if defined(__APPLE__)
+ if (likely(semaphore_destroy(mach_task_self(), *sem) == KERN_SUCCESS))
+ return;
+
+ val = EINVAL;
+#else
if (likely(sem_destroy (sem) == 0))
return;
- int val = errno;
+ val = errno;
+#endif
+
VLC_THREAD_ASSERT ("destroying semaphore");
}
*/
int vlc_sem_post (vlc_sem_t *sem)
{
+ int val;
+
+#if defined(__APPLE__)
+ if (likely(semaphore_signal(*sem) == KERN_SUCCESS))
+ return 0;
+
+ val = EINVAL;
+#else
if (likely(sem_post (sem) == 0))
return 0;
- int val = errno;
+ val = errno;
+#endif
+
if (unlikely(val != EOVERFLOW))
VLC_THREAD_ASSERT ("unlocking semaphore");
return val;
{
int val;
+#if defined(__APPLE__)
+ if (likely(semaphore_wait(*sem) == KERN_SUCCESS))
+ return;
+
+ val = EINVAL;
+#else
do
if (likely(sem_wait (sem) == 0))
return;
while ((val = errno) == EINTR);
+#endif
VLC_THREAD_ASSERT ("locking semaphore");
}