sprinkle the source with HAVE_MACH

Author: KatashiMonosato

private/voucher_private.h

@@ -404,7 +404,6 @@ dispatch_queue_create_with_accounting_override_voucher(const char *label,
 
 #ifdef __APPLE__
 #include <mach/mach.h>
-#endif
 
 /*!
  * @function voucher_create_with_mach_msg
@@ -428,6 +427,7 @@ OS_VOUCHER_EXPORT OS_OBJECT_RETURNS_RETAINED OS_WARN_RESULT OS_NOTHROW
 voucher_t
 voucher_create_with_mach_msg(mach_msg_header_t *msg);
 
+#endif
 __END_DECLS
 
 #endif // __OS_VOUCHER_PRIVATE__

src/init.c

@@ -335,6 +335,7 @@ DISPATCH_VTABLE_INSTANCE(source,
 	.do_debug = _dispatch_source_debug,
 );
 
+#if HAVE_MACH
 DISPATCH_VTABLE_INSTANCE(mach,
 	.do_type = DISPATCH_MACH_CHANNEL_TYPE,
 	.do_kind = "mach-channel",
@@ -351,6 +352,7 @@ DISPATCH_VTABLE_INSTANCE(mach_msg,
 	.do_invoke = _dispatch_mach_msg_invoke,
 	.do_debug = _dispatch_mach_msg_debug,
 );
+#endif
 
 #if !USE_OBJC
 DISPATCH_VTABLE_INSTANCE(data,
@@ -793,6 +795,7 @@ _dispatch_client_callout2(void *ctxt, size_t i, void (*f)(void *, size_t))
 	_dispatch_set_unwind_tsd(u);
 }
 
+#if HAVE_MACH
 #undef _dispatch_client_callout4
 void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
@@ -807,6 +810,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 	_dispatch_free_unwind_tsd();
 	_dispatch_set_unwind_tsd(u);
 }
+#endif
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 

src/inline_internal.h

@@ -38,10 +38,12 @@ DISPATCH_NOTHROW void
 _dispatch_client_callout(void *ctxt, dispatch_function_t f);
 DISPATCH_NOTHROW void
 _dispatch_client_callout2(void *ctxt, size_t i, void (*f)(void *, size_t));
+#if HAVE_MACH
 DISPATCH_NOTHROW void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 		dispatch_mach_msg_t dmsg, mach_error_t error,
 		dispatch_mach_handler_function_t f);
+#endif
 
 #else // !DISPATCH_USE_CLIENT_CALLOUT
 
@@ -59,6 +61,7 @@ _dispatch_client_callout2(void *ctxt, size_t i, void (*f)(void *, size_t))
 	return f(ctxt, i);
 }
 
+#if HAVE_MACH
 DISPATCH_ALWAYS_INLINE
 static inline void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
@@ -67,6 +70,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 {
 	return f(ctxt, reason, dmsg, error);
 }
+#endif
 
 #endif // !DISPATCH_USE_CLIENT_CALLOUT
 

src/internal.h

@@ -324,10 +324,10 @@ DISPATCH_NOINLINE
 void _dispatch_bug_client(const char* msg);
 DISPATCH_NOINLINE
 void _dispatch_bug_mach_client(const char *msg, mach_msg_return_t kr);
+#endif
 DISPATCH_NOINLINE
 void _dispatch_bug_kevent_client(const char* msg, const char* filter,
 		const char *operation, int err);
-#endif
 
 DISPATCH_NOINLINE DISPATCH_NORETURN
 void _dispatch_abort(size_t line, long val);

src/object.m

@@ -524,6 +524,7 @@ - (NSString *)debugDescription {
 	}
 }
 
+#if HAVE_MACH
 #undef _dispatch_client_callout4
 void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
@@ -537,6 +538,7 @@ - (NSString *)debugDescription {
 		objc_terminate();
 	}
 }
+#endif
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 

src/queue.c

@@ -858,6 +858,7 @@ _dispatch_root_queue_init_pthread_pool(dispatch_root_queue_context_t qc,
 		thread_pool_size = pool_size;
 	}
 	qc->dgq_thread_pool_size = thread_pool_size;
+#if HAVE_PTHREAD_WORKQUEUES
 	if (qc->dgq_qos) {
 		(void)dispatch_assume_zero(pthread_attr_init(&pqc->dpq_thread_attr));
 		(void)dispatch_assume_zero(pthread_attr_setdetachstate(
@@ -867,6 +868,7 @@ _dispatch_root_queue_init_pthread_pool(dispatch_root_queue_context_t qc,
 				&pqc->dpq_thread_attr, qc->dgq_qos, 0));
 #endif
 	}
+#endif
 #if USE_MACH_SEM
 	// override the default FIFO behavior for the pool semaphores
 	kern_return_t kr = semaphore_create(mach_task_self(),
@@ -1464,6 +1466,7 @@ static dispatch_once_t _dispatch_mgr_sched_pred;
 
 // TODO: switch to "event-reflector thread" property <rdar://problem/18126138>
 
+#if HAVE_PTHREAD_WORKQUEUE_QOS
 // Must be kept in sync with list of qos classes in sys/qos.h
 static const int _dispatch_mgr_sched_qos2prio[] = {
 	[_DISPATCH_QOS_CLASS_MAINTENANCE] = 4,
@@ -1473,6 +1476,7 @@ static const int _dispatch_mgr_sched_qos2prio[] = {
 	[_DISPATCH_QOS_CLASS_USER_INITIATED] = 37,
 	[_DISPATCH_QOS_CLASS_USER_INTERACTIVE] = 47,
 };
+#endif
 
 static void
 _dispatch_mgr_sched_init(void *ctxt DISPATCH_UNUSED)
@@ -4056,7 +4060,7 @@ _dispatch_queue_push_override(dispatch_queue_t dq, dispatch_queue_t tq,
 
 	_dispatch_queue_push(rq, dc, 0);
 #else
-	(void)dq; (void)tq; (void)p;
+	(void)dq; (void)tq; (void)p; (void)owning;
 #endif
 }
 

src/shims/linux_stubs.c

@@ -24,7 +24,7 @@
  */
 
 #include <stdint.h>
-
+#include <syscall.h>
 #include <config/config.h>
 
 #include "pthread.h"
@@ -35,44 +35,22 @@
 #undef LINUX_PORT_ERROR
 #define LINUX_PORT_ERROR()  do { printf("LINUX_PORT_ERROR_CALLED %s:%d: %s\n",__FILE__,__LINE__,__FUNCTION__); abort(); } while (0)
 
-void _dispatch_mach_msg_dispose() { LINUX_PORT_ERROR();  }
-
-unsigned long _dispatch_mach_probe(dispatch_mach_t dm) {
-  LINUX_PORT_ERROR();
-}
-
 dispatch_block_t _dispatch_block_create(dispatch_block_flags_t flags,
 					voucher_t voucher, pthread_priority_t priority,
 					dispatch_block_t block) {
   LINUX_PORT_ERROR();
 }
 
-void _dispatch_mach_invoke() { LINUX_PORT_ERROR();  }
-
-size_t _dispatch_mach_msg_debug(dispatch_mach_msg_t dmsg, char* buf, size_t bufsiz) {
-  LINUX_PORT_ERROR();
-}
-void _dispatch_mach_dispose() { LINUX_PORT_ERROR();  }
-void _dispatch_mach_msg_invoke() { LINUX_PORT_ERROR();  }
-
 unsigned long _dispatch_runloop_queue_probe(dispatch_queue_t dq) {
   LINUX_PORT_ERROR();
 }
 void _dispatch_runloop_queue_xref_dispose() { LINUX_PORT_ERROR();  }
 
 void _dispatch_runloop_queue_dispose() { LINUX_PORT_ERROR();  }
-char* mach_error_string(mach_msg_return_t x) {
-  LINUX_PORT_ERROR();
-}
-
 void mach_vm_deallocate() { LINUX_PORT_ERROR();  }
 
 mach_port_t pthread_mach_thread_np() {
-  return (mach_port_t)pthread_self();
-}
-
-mach_port_t mach_task_self() {
-  return (mach_port_t)pthread_self();
+  return (pid_t)syscall(SYS_gettid);
 }
 
 /*

src/source.c

@@ -604,11 +604,13 @@ _dispatch_source_kevent_resume(dispatch_source_t ds, uint32_t new_flags)
 		_dispatch_debug("kevent-source[%p]: rearmed kevent[%p]", ds,
 				ds->ds_dkev);
 		return;
+#if HAVE_MACH
 	case EVFILT_MACHPORT:
 		if (ds->ds_pending_data_mask & DISPATCH_MACH_RECV_MESSAGE) {
 			new_flags |= DISPATCH_MACH_RECV_MESSAGE; // emulate EV_DISPATCH
 		}
 		break;
+#endif
 	}
 	if ((ds->ds_atomic_flags & DSF_DELETED) ||
 			_dispatch_kevent_resume(ds->ds_dkev, new_flags, 0)) {
@@ -931,6 +933,7 @@ _dispatch_kevent_hash(uint64_t ident, short filter)
 			MACH_PORT_INDEX(ident) : ident);
 #else
 	value = ident;
+	(void)filter;
 #endif
 	return DSL_HASH((uintptr_t)value);
 }
@@ -1025,6 +1028,10 @@ _dispatch_kevent_resume(dispatch_kevent_t dk, uint32_t new_flags,
 		}
 		return r;
 	}
+#if !HAVE_MACH
+	(void)new_flags;
+	(void)del_flags;
+#endif
 }
 
 static long
@@ -4766,13 +4773,10 @@ _dispatch_source_debug(dispatch_source_t ds, char* buf, size_t bufsiz)
 	return offset;
 }
 
+#if HAVE_MACH
 static size_t
 _dispatch_mach_debug_attr(dispatch_mach_t dm, char* buf, size_t bufsiz)
 {
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-	return (size_t)0;
-#else
 	dispatch_queue_t target = dm->do_targetq;
 	return dsnprintf(buf, bufsiz, "target = %s[%p], receive = 0x%x, "
 			"send = 0x%x, send-possible = 0x%x%s, checkin = 0x%x%s, "
@@ -4786,15 +4790,10 @@ _dispatch_mach_debug_attr(dispatch_mach_t dm, char* buf, size_t bufsiz)
 			dm->dm_refs->dm_checkin ? " (pending)" : "",
 			dm->dm_refs->dm_sending, dm->dm_refs->dm_disconnect_cnt,
 			(bool)(dm->ds_atomic_flags & DSF_CANCELED));
-#endif	
 }
 size_t
 _dispatch_mach_debug(dispatch_mach_t dm, char* buf, size_t bufsiz)
 {
-#ifdef __LINUX_PORT_HDD__
-	LINUX_PORT_ERROR();
-	return (size_t)0;
-#else
 	size_t offset = 0;
 	offset += dsnprintf(&buf[offset], bufsiz - offset, "%s[%p] = { ",
 			dm->dq_label && !dm->dm_cancel_handler_called ? dm->dq_label :
@@ -4803,8 +4802,8 @@ _dispatch_mach_debug(dispatch_mach_t dm, char* buf, size_t bufsiz)
 	offset += _dispatch_mach_debug_attr(dm, &buf[offset], bufsiz - offset);
 	offset += dsnprintf(&buf[offset], bufsiz - offset, "}");
 	return offset;
-#endif	
 }
+#endif
 
 #if DISPATCH_DEBUG
 DISPATCH_NOINLINE

src/source_internal.h

@@ -38,6 +38,7 @@
 #define DISPATCH_EVFILT_MACH_NOTIFICATION	(-EVFILT_SYSCOUNT - 4)
 #define DISPATCH_EVFILT_SYSCOUNT	( EVFILT_SYSCOUNT + 4)
 
+#if HAVE_MACH
 // NOTE: dispatch_source_mach_send_flags_t and dispatch_source_mach_recv_flags_t
 //       bit values must not overlap as they share the same kevent fflags !
 
@@ -68,6 +69,7 @@ enum {
 	DISPATCH_MACH_RECV_MESSAGE_DIRECT_ONCE = 0x20,
 	DISPATCH_MACH_RECV_NO_SENDERS = 0x40,
 };
+#endif
 
 enum {
 	DISPATCH_TIMER_WALL_CLOCK = 0x4,
@@ -201,6 +203,7 @@ struct dispatch_source_s {
 	unsigned long ds_pending_data;
 };
 
+#if HAVE_MACH
 // Mach channel state which may contain references to the channel object
 // layout must match dispatch_source_refs_s
 struct dispatch_mach_refs_s {
@@ -258,6 +261,7 @@ struct dispatch_mach_msg_s {
 		char dmsg_buf[0];
 	};
 };
+#endif
 
 #if TARGET_OS_EMBEDDED
 #define DSL_HASH_SIZE  64u // must be a power of two
@@ -275,6 +279,7 @@ void _dispatch_source_set_interval(dispatch_source_t ds, uint64_t interval);
 void _dispatch_source_set_event_handler_with_context_f(dispatch_source_t ds,
 		void *ctxt, dispatch_function_t handler);
 
+#if HAVE_MACH
 void _dispatch_mach_dispose(dispatch_mach_t dm);
 void _dispatch_mach_invoke(dispatch_mach_t dm, dispatch_object_t dou,
 		dispatch_invoke_flags_t flags);
@@ -287,6 +292,7 @@ void _dispatch_mach_msg_invoke(dispatch_mach_msg_t dmsg, dispatch_object_t dou,
 size_t _dispatch_mach_msg_debug(dispatch_mach_msg_t dmsg, char* buf, size_t bufsiz);
 
 void _dispatch_mach_barrier_invoke(void *ctxt);
+#endif
 
 unsigned long _dispatch_mgr_wakeup(dispatch_queue_t dq);
 void _dispatch_mgr_thread(dispatch_queue_t dq, dispatch_object_t dou,