Move more nursery fragment code from sgen-gc.c

[mono.git] / mono / utils / mono-semaphore.h

diff --git a/mono/utils/mono-semaphore.h b/mono/utils/mono-semaphore.h
index 6ceb861c9c19824c7aba25f7087ff4161748bc82..d6be806efe5a2b14a52129a46b72745490d5413a 100644 (file)
--- a/mono/utils/mono-semaphore.h
+++ b/mono/utils/mono-semaphore.h
@@ -11,9 +11,11 @@
 #define _MONO_SEMAPHORE_H_
 
 #include <config.h>
+#include <glib.h>
 #ifdef HAVE_SEMAPHORE_H
 #include <semaphore.h>
 #endif
+#include <mono/io-layer/io-layer.h>
 
 #if defined (HAVE_SEMAPHORE_H) || defined (USE_MACH_SEMA)
 #  define MONO_HAS_SEMAPHORES
@@ -24,23 +26,30 @@
 #    include <mach/semaphore.h>
 typedef semaphore_t MonoSemType;
 #    define MONO_SEM_INIT(addr,value) semaphore_create (current_task (), (addr), SYNC_POLICY_FIFO, (value))
-#    define MONO_SEM_WAIT(sem) semaphore_wait (*(sem))
-#    define MONO_SEM_POST(sem) semaphore_signal (*(sem))
 #    define MONO_SEM_DESTROY(sem) semaphore_destroy (current_task (), *(sem))
 #  else
 typedef sem_t MonoSemType;
 #    define MONO_SEM_INIT(addr,value) sem_init ((addr), 0, (value))
-#    define MONO_SEM_WAIT(sem) sem_wait ((sem))
-#    define MONO_SEM_POST(sem) sem_post ((sem))
 #    define MONO_SEM_DESTROY(sem) sem_destroy ((sem))
 #  endif
-#elif defined(HOST_WIN32)
+#else
 #  define MONO_HAS_SEMAPHORES
 typedef HANDLE MonoSemType;
 #    define MONO_SEM_INIT(addr,initial) do {*(addr) = CreateSemaphore ( NULL,(initial),0x7FFFFFFF,NULL);} while(0)
-#    define MONO_SEM_WAIT(sem) WaitForSingleObjectEx (*(sem),INFINITE, TRUE)
-#    define MONO_SEM_POST(sem) (!(ReleaseSemaphore (*(sem),1,NULL)))
 #    define MONO_SEM_DESTROY(sem) CloseHandle (*(sem))
 #endif
 
+#define MONO_SEM_WAIT(sem) MONO_SEM_WAIT_ALERTABLE(sem, FALSE)
+#define MONO_SEM_WAIT_ALERTABLE(sem,alertable) mono_sem_wait ((sem), alertable)
+#define MONO_SEM_POST(sem) mono_sem_post ((sem))
+#define MONO_SEM_TIMEDWAIT(sem, timeout_ms) MONO_SEM_TIMEDWAIT_ALERTABLE(sem, timeout_ms, FALSE)
+#define MONO_SEM_TIMEDWAIT_ALERTABLE(sem, timeout_ms, alertable) mono_sem_timedwait ((sem), (timeout_ms), alertable) 
+
+G_BEGIN_DECLS
+
+int mono_sem_wait (MonoSemType *sem, gboolean alertable);
+int mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable);
+int mono_sem_post (MonoSemType *sem);
+
+G_END_DECLS
 #endif /* _MONO_SEMAPHORE_H_ */