Linux port of libdispatch-685 merge

Minimal set of changes to get sources merged
from libdispatch-685 to compile and run on Linux.

Author: dgrove-oss

configure.ac

@@ -295,9 +295,6 @@ AC_MSG_CHECKING([what semaphore type to use]);
 AS_IF([test "x$have_mach" = "xtrue"],
   [AC_DEFINE(USE_MACH_SEM, 1, [Define to use Mach semaphores])
     AC_MSG_RESULT([Mach semaphores])],
-  [test "x$have_futex" = "xtrue"],
-  [AC_DEFINE(USE_FUTEX_SEM, 1, [Define to use Futex semaphores])
-    AC_MSG_RESULT([Futex semaphores])],
   [test "x$have_sem_init" = "xtrue"],
   [AC_DEFINE(USE_POSIX_SEM, 1, [Define to use POSIX semaphores])
     AC_MSG_RESULT([POSIX semaphores])],

os/linux_base.h

@@ -38,6 +38,8 @@ typedef uint32_t mach_msg_return_t;
 
 typedef uintptr_t mach_vm_address_t;
 
+typedef uint32_t mach_msg_bits_t;
+
 typedef uint32_t dispatch_mach_msg_t;
 
 typedef uint32_t dispatch_mach_t;
@@ -48,12 +50,25 @@ typedef uint32_t voucher_activity_mode_t;
 
 typedef uint32_t voucher_activity_trace_id_t;
 
+typedef uint32_t voucher_activity_hooks_t;
+
 typedef uint32_t voucher_activity_id_t;
 
 typedef uint32_t _voucher_activity_buffer_hook_t;;
 
 typedef uint32_t voucher_activity_flag_t;
 
+typedef uint32_t firehose_activity_id_t;
+
+typedef uint32_t firehose_activity_flags_t;
+
+typedef uint32_t firehose_activity_mode_t;
+
+typedef uint32_t firehose_tracepoint_id_t;
+
+typedef uint32_t firehose_stream_t;
+
+
 typedef struct
 {
 } mach_msg_header_t;
@@ -123,12 +138,67 @@ typedef void (*dispatch_mach_msg_destructor_t)(void*);
 #endif
 #define OS_NOTHROW
 
+#ifdef OS_ASSUME_NONNULL_BEGIN
+#undef OS_ASSUME_NONNULL_BEGIN
+#endif
+#define OS_ASSUME_NONNULL_BEGIN
+
+#ifdef OS_ASSUME_NONNULL_END
+#undef OS_ASSUME_NONNULL_END
+#endif
+#define OS_ASSUME_NONNULL_END
+
+#ifdef OS_SWIFT_UNAVAILABLE
+#undef OS_SWIFT_UNAVAILABLE
+#endif
+#define OS_SWIFT_UNAVAILABLE(errstring)
+
 
 // These and similar macros come from Availabilty.h on OS X
 // Need a better way to do this long term.
 #define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d) //
 #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(a,b,c,d,msg) //
+#define __OSX_DEPRECATED(a,b,c) //
+#define __IOS_DEPRECATED(a,b,c) //
+#define __TVOS_DEPRECATED(a,b,c) //
+#define __WATCHOS_DEPRECATED(a,b,c) //
+
+
+#ifdef __OSX_AVAILABLE
+#undef __OSX_AVAILABLE
+#endif
+#define __OSX_AVAILABLE(version)
+
+#ifdef __IOS_AVAILABLE
+#undef __IOS_AVAILABLE
+#endif
+#define __IOS_AVAILABLE(version)
+
+#ifdef __TVOS_AVAILABLE
+#undef __TVOS_AVAILABLE
+#endif
+#define __TVOS_AVAILABLE(version)
+
+#ifdef __WATCHOS_AVAILABLE
+#undef __WATCHOS_AVAILABLE
+#endif
+#define __WATCHOS_AVAILABLE(version)
+
+#ifndef os_likely
+#define os_likely(cond)  (cond)
+#endif
+
+#ifndef os_unlikely
+#define os_unlikely(cond)  (cond)
+#endif
+
+#define __OS_STRINGIFY(s) #s
+#define OS_STRINGIFY(s) __OS_STRINGIFY(s)
 
+#define __OS_CONCAT(x,y) x ## y
+#define OS_CONCAT(x,y) __OS_CONCAT(x,y)
 
+int
+_pthread_qos_class_decode(int prio, int*, void*);
 
 #endif /* __OS_LINUX_BASE__ */

src/firehose/firehose_internal.h

@@ -27,6 +27,7 @@
 #define __MigTypeCheck 1
 #endif
 
+#ifdef OS_FIREHOSE_SPI
 #include <limits.h>
 #include <machine/endian.h>
 #include <mach/mach_types.h>
@@ -43,5 +44,6 @@
 #include "firehose_server_internal.h"
 #endif
 #include "firehose_inline_internal.h"
+#endif // OS_FIREHOSE_SPI
 
 #endif // __FIREHOSE_INTERNAL__

src/init.c

@@ -486,6 +486,7 @@ const struct dispatch_continuation_vtable_s _dispatch_continuation_vtables[] = {
 	DC_VTABLE_ENTRY(ASYNC_REDIRECT,
 		.do_kind = "dc-redirect",
 		.do_invoke = _dispatch_async_redirect_invoke),
+#if HAVE_MACH
 	DC_VTABLE_ENTRY(MACH_SEND_BARRRIER_DRAIN,
 		.do_kind = "dc-mach-send-drain",
 		.do_invoke = _dispatch_mach_send_barrier_drain_invoke),
@@ -495,6 +496,7 @@ const struct dispatch_continuation_vtable_s _dispatch_continuation_vtables[] = {
 	DC_VTABLE_ENTRY(MACH_RECV_BARRIER,
 		.do_kind = "dc-mach-recv-barrier",
 		.do_invoke = _dispatch_mach_barrier_invoke),
+#endif
 #if HAVE_PTHREAD_WORKQUEUE_QOS
 	DC_VTABLE_ENTRY(OVERRIDE_STEALING,
 		.do_kind = "dc-override-stealing",
@@ -1195,7 +1197,9 @@ dispatch_source_type_readwrite_init(dispatch_source_t ds,
 {
 	ds->ds_is_level = true;
 	// bypass kernel check for device kqueue support rdar://19004921
+#ifdef NOTE_LOWAT
 	ds->ds_dkev->dk_kevent.fflags = NOTE_LOWAT;
+#endif
 	ds->ds_dkev->dk_kevent.data = 1;
 }
 

src/inline_internal.h

@@ -1888,7 +1888,7 @@ _dispatch_reset_defaultpriority(pthread_priority_t pp)
 	pp |= old_pp & _PTHREAD_PRIORITY_OVERRIDE_FLAG;
 	_dispatch_thread_setspecific(dispatch_defaultpriority_key, (void*)pp);
 #else
-	(void)priority;
+	(void)pp;
 #endif
 }
 
@@ -1994,7 +1994,7 @@ _dispatch_priority_adopt(pthread_priority_t pp, unsigned long flags)
 		return defaultpri;
 	}
 #else
-	(void)priority; (void)flags;
+	(void)pp; (void)flags;
 	return 0;
 #endif
 }
@@ -2038,6 +2038,7 @@ _dispatch_priority_compute_update(pthread_priority_t pp,
 		_dispatch_thread_set_self_t flags)
 {
 	dispatch_assert(pp != DISPATCH_NO_PRIORITY);
+#if HAVE_PTHREAD_WORKQUEUE_QOS
 	if (!_dispatch_set_qos_class_enabled) return 0;
 	// the priority in _dispatch_get_priority() only tracks manager-ness
 	// and overcommit, which is inherited from the current value for each update
@@ -2047,7 +2048,6 @@ _dispatch_priority_compute_update(pthread_priority_t pp,
 	// the manager bit is invalid input, but we keep it to get meaningful
 	// assertions in _dispatch_set_priority_and_voucher_slow()
 	pp &= _PTHREAD_PRIORITY_EVENT_MANAGER_FLAG | ~_PTHREAD_PRIORITY_FLAGS_MASK;
-#if HAVE_PTHREAD_WORKQUEUE_QOS
 	pthread_priority_t cur_priority = _dispatch_get_priority();
 	pthread_priority_t unbind = _PTHREAD_PRIORITY_NEEDS_UNBIND_FLAG;
 	pthread_priority_t overcommit = _PTHREAD_PRIORITY_OVERCOMMIT_FLAG;

src/internal.h

@@ -232,6 +232,7 @@ DISPATCH_EXPORT DISPATCH_NOTHROW void dispatch_atfork_child(void);
 #endif // __has_include(<malloc_private.h)
 
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #if !TARGET_OS_WIN32
 #include <sys/event.h>
@@ -402,8 +403,8 @@ DISPATCH_EXPORT DISPATCH_NOINLINE __attribute__((__format__(__printf__,1,2)))
 void _dispatch_log(const char *msg, ...);
 #endif // DISPATCH_USE_OS_DEBUG_LOG
 
-#define dsnprintf(...) \
-		({ int _r = snprintf(__VA_ARGS__); _r < 0 ? 0u : (size_t)_r; })
+#define dsnprintf(buf,sz,fmt, ...) \
+		({ int _r = snprintf(buf,sz,fmt, ## __VA_ARGS__); _r < 0 ? 0u : (size_t)_r; })
 
 #if __GNUC__
 #define dispatch_static_assert(e) ({ \

src/object.c

@@ -240,7 +240,7 @@ dispatch_set_target_queue(dispatch_object_t dou, dispatch_queue_t tq)
 	} else if (dou._do->do_ref_cnt != DISPATCH_OBJECT_GLOBAL_REFCNT &&
 			!slowpath(dx_hastypeflag(dou._do, QUEUE_ROOT))) {
 		if (slowpath(!tq)) {
-			tq = _dispatch_get_root_queue(QOS_CLASS_DEFAULT, false);
+			tq = _dispatch_get_root_queue(_DISPATCH_QOS_CLASS_DEFAULT, false);
 		}
 		_dispatch_object_set_target_queue_inline(dou._do, tq);
 	}

src/queue.c

@@ -909,10 +909,10 @@ libdispatch_init(void)
 #if DISPATCH_PERF_MON && !DISPATCH_INTROSPECTION
 	_dispatch_thread_key_create(&dispatch_bcounter_key, NULL);
 #endif
-	if (DISPATCH_LOCK_USE_SEMAPHORE_FALLBACK) {
-		_dispatch_thread_key_create(&dispatch_sema4_key,
+#if DISPATCH_LOCK_USE_SEMAPHORE_FALLBACK
+	_dispatch_thread_key_create(&dispatch_sema4_key,
 				_dispatch_thread_semaphore_dispose);
-	}
+#endif
 
 #if DISPATCH_USE_RESOLVERS // rdar://problem/8541707
 	_dispatch_main_q.do_targetq = &_dispatch_root_queues[
@@ -1076,7 +1076,7 @@ _dispatch_get_queue_attr(qos_class_t qos, int prio,
 dispatch_queue_attr_t
 _dispatch_get_default_queue_attr(void)
 {
-	return _dispatch_get_queue_attr(QOS_CLASS_UNSPECIFIED, 0,
+	return _dispatch_get_queue_attr(_DISPATCH_QOS_CLASS_UNSPECIFIED, 0,
 				_dispatch_queue_attr_overcommit_unspecified,
 				DISPATCH_AUTORELEASE_FREQUENCY_INHERIT, false, false);
 }
@@ -2655,13 +2655,15 @@ _dispatch_block_create_with_voucher_and_priority(dispatch_block_flags_t flags,
 	flags = _dispatch_block_normalize_flags(flags);
 	bool assign = (flags & DISPATCH_BLOCK_ASSIGN_CURRENT);
 
+#if HAVE_MACH
 	if (assign && !(flags & DISPATCH_BLOCK_HAS_VOUCHER)) {
 		voucher = VOUCHER_CURRENT;
 		flags |= DISPATCH_BLOCK_HAS_VOUCHER;
 	}
 	if (voucher == VOUCHER_CURRENT) {
 		voucher = _voucher_get();
 	}
+#endif
 	if (assign && !(flags & DISPATCH_BLOCK_HAS_PRIORITY)) {
 		pri = _dispatch_priority_propagate();
 		flags |= DISPATCH_BLOCK_HAS_PRIORITY;
@@ -4023,6 +4025,13 @@ _dispatch_runloop_queue_wakeup(dispatch_queue_t dq, pthread_priority_t pp,
 		return _dispatch_release_tailcall(dq);
 	}
 }
+#else
+void
+_dispatch_runloop_queue_wakeup(dispatch_queue_t dq, pthread_priority_t pp,
+		dispatch_wakeup_flags_t flags)
+{
+	LINUX_PORT_ERROR();
+}
 #endif
 
 void
@@ -5750,3 +5759,15 @@ _dispatch_context_cleanup(void *ctxt)
 	DISPATCH_INTERNAL_CRASH(ctxt,
 			"Premature thread exit while a dispatch context is set");
 }
+
+#if !DISPATCH_COCOA_COMPAT
+// FIXME:  Need real implementation of this + related functions for Linux
+DISPATCH_NOINLINE
+void
+_dispatch_queue_class_override_drainer(dispatch_queue_t dq,
+		pthread_priority_t pp, dispatch_wakeup_flags_t flags)
+{
+	(void)dq; (void)pp; (void)flags;
+	LINUX_PORT_ERROR();
+}
+#endif

src/shims/linux_stubs.c

@@ -63,3 +63,12 @@ unsigned short dispatch_callout__return_semaphore;
 unsigned short dispatch_queue__push_semaphore;
 void (*_dispatch_block_special_invoke)(void*);
 struct dispatch_queue_attr_s _dispatch_queue_attr_concurrent;
+
+
+int
+ _pthread_qos_class_decode(int prio, int* what, void* ever)
+{
+	(void)what; (void)ever;
+	return prio;
+}
+