X-Git-Url: https://git.saurik.com/apple/libdispatch.git/blobdiff_plain/c093abd6701fa4c95f99104066f1f80a1c3c39e0..refs/heads/master:/src/semaphore_internal.h

diff --git a/src/semaphore_internal.h b/src/semaphore_internal.h
index e27f934..f9d0983 100644
--- a/src/semaphore_internal.h
+++ b/src/semaphore_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_APACHE_LICENSE_HEADER_START@
  *
@@ -29,45 +29,46 @@
 
 struct dispatch_queue_s;
 
-struct dispatch_sema_notify_s {
-	struct dispatch_sema_notify_s *volatile dsn_next;
-	struct dispatch_queue_s *dsn_queue;
-	void *dsn_ctxt;
-	void (*dsn_func)(void *);
+#define DISPATCH_SEMAPHORE_HEADER(cls, ns) \
+	DISPATCH_OBJECT_HEADER(cls); \
+	long volatile ns##_value; \
+	_dispatch_sema4_t ns##_sema
+
+struct dispatch_semaphore_header_s {
+	DISPATCH_SEMAPHORE_HEADER(semaphore, dsema);
 };
 
 DISPATCH_CLASS_DECL(semaphore);
 struct dispatch_semaphore_s {
-	DISPATCH_STRUCT_HEADER(semaphore);
-	long dsema_value;
+	DISPATCH_SEMAPHORE_HEADER(semaphore, dsema);
 	long dsema_orig;
-	size_t dsema_sent_ksignals;
-#if USE_MACH_SEM && USE_POSIX_SEM
-#error "Too many supported semaphore types"
-#elif USE_MACH_SEM
-	semaphore_t dsema_port;
-	semaphore_t dsema_waiter_port;
-#elif USE_POSIX_SEM
-	sem_t dsema_sem;
-#else
-#error "No supported semaphore type"
-#endif
-	size_t dsema_group_waiters;
-	struct dispatch_sema_notify_s *dsema_notify_head;
-	struct dispatch_sema_notify_s *dsema_notify_tail;
 };
 
 DISPATCH_CLASS_DECL(group);
+struct dispatch_group_s {
+	DISPATCH_SEMAPHORE_HEADER(group, dg);
+	int volatile dg_waiters;
+	struct dispatch_continuation_s *volatile dg_notify_head;
+	struct dispatch_continuation_s *volatile dg_notify_tail;
+};
 
-void _dispatch_semaphore_dispose(dispatch_object_t dou);
-size_t _dispatch_semaphore_debug(dispatch_object_t dou, char *buf,
+typedef union {
+	struct dispatch_semaphore_header_s *_dsema_hdr;
+	struct dispatch_semaphore_s *_dsema;
+	struct dispatch_group_s *_dg;
+#if USE_OBJC
+	dispatch_semaphore_t _objc_dsema;
+	dispatch_group_t _objc_dg;
+#endif
+} dispatch_semaphore_class_t DISPATCH_TRANSPARENT_UNION;
+
+dispatch_group_t _dispatch_group_create_and_enter(void);
+void _dispatch_group_dispose(dispatch_object_t dou, bool *allow_free);
+size_t _dispatch_group_debug(dispatch_object_t dou, char *buf,
 		size_t bufsiz);
 
-typedef uintptr_t _dispatch_thread_semaphore_t;
-_dispatch_thread_semaphore_t _dispatch_get_thread_semaphore(void);
-void _dispatch_put_thread_semaphore(_dispatch_thread_semaphore_t);
-void _dispatch_thread_semaphore_wait(_dispatch_thread_semaphore_t);
-void _dispatch_thread_semaphore_signal(_dispatch_thread_semaphore_t);
-void _dispatch_thread_semaphore_dispose(_dispatch_thread_semaphore_t);
+void _dispatch_semaphore_dispose(dispatch_object_t dou, bool *allow_free);
+size_t _dispatch_semaphore_debug(dispatch_object_t dou, char *buf,
+		size_t bufsiz);
 
 #endif