libdispatch open source import fixups.

rdar://problem/54572081

Author: ktopley-apple

CMakeLists.txt

@@ -192,7 +192,10 @@ check_function_exists(malloc_create_zone HAVE_MALLOC_CREATE_ZONE)
 check_function_exists(posix_fadvise HAVE_POSIX_FADVISE)
 check_function_exists(posix_spawnp HAVE_POSIX_SPAWNP)
 check_function_exists(pthread_key_init_np HAVE_PTHREAD_KEY_INIT_NP)
+check_function_exists(pthread_attr_setcpupercent_np HAVE_PTHREAD_ATTR_SETCPUPERCENT_NP)
+check_function_exists(pthread_yield_np HAVE_PTHREAD_YIELD_NP)
 check_function_exists(pthread_main_np HAVE_PTHREAD_MAIN_NP)
+check_function_exists(pthread_workqueue_setdispatch_np HAVE_PTHREAD_WORKQUEUE_SETDISPATCH_NP)
 check_function_exists(strlcpy HAVE_STRLCPY)
 check_function_exists(sysconf HAVE_SYSCONF)
 check_function_exists(arc4random HAVE_ARC4RANDOM)

cmake/config.h.in

@@ -145,12 +145,18 @@
 /* Define to 1 if you have the `pthread_key_init_np' function. */
 #cmakedefine HAVE_PTHREAD_KEY_INIT_NP
 
+/* Define to 1 if you have the `pthread_attr_setcpupercent_np' function. */
+#cmakedefine HAVE_PTHREAD_ATTR_SETCPUPERCENT_NP
+
 /* Define to 1 if you have the <pthread_machdep.h> header file. */
 #cmakedefine HAVE_PTHREAD_MACHDEP_H
 
 /* Define to 1 if you have the `pthread_main_np' function. */
 #cmakedefine01 HAVE_PTHREAD_MAIN_NP
 
+/* Define to 1 if you have the `pthread_yield_np' function. */
+#cmakedefine01 HAVE_PTHREAD_YIELD_NP
+
 /* Define to 1 if you have the <pthread_np.h> header file. */
 #cmakedefine01 HAVE_PTHREAD_NP_H
 

private/queue_private.h

@@ -149,6 +149,13 @@ dispatch_set_qos_class_fallback(dispatch_object_t object,
 
 #define DISPATCH_QUEUE_FLAGS_MASK (DISPATCH_QUEUE_OVERCOMMIT)
 
+// On FreeBSD pthread_attr_t is a typedef to a pointer type
+#if defined(__FreeBSD__)
+#  define DISPATCH_QUEUE_NULLABLE_PTHREAD_ATTR_PTR _Nullable
+#else
+#  define DISPATCH_QUEUE_NULLABLE_PTHREAD_ATTR_PTR
+#endif
+
 /*!
  * @function dispatch_queue_attr_make_with_overcommit
  *
@@ -329,7 +336,7 @@ DISPATCH_EXPORT DISPATCH_MALLOC DISPATCH_RETURNS_RETAINED DISPATCH_WARN_RESULT
 DISPATCH_NOTHROW
 dispatch_queue_global_t
 dispatch_pthread_root_queue_create(const char *_Nullable label,
-		unsigned long flags, const pthread_attr_t *_Nullable attr,
+		unsigned long flags, const pthread_attr_t DISPATCH_QUEUE_NULLABLE_PTHREAD_ATTR_PTR *_Nullable attr,
 		dispatch_block_t _Nullable configure);
 
 /*!

src/CMakeLists.txt

@@ -54,6 +54,7 @@ add_library(dispatch
               shims/perfmon.h
               shims/time.h
               shims/tsd.h
+              shims/yield.c
               shims/yield.h)
 
 set_target_properties(dispatch

src/event/event_kevent.c

@@ -873,6 +873,7 @@ _dispatch_kq_unote_set_kevent(dispatch_unote_t _du, dispatch_kevent_t dk,
 				du->du_priority),
 #endif
 	};
+	(void)pp; // if DISPATCH_USE_KEVENT_QOS == 0
 }
 
 DISPATCH_ALWAYS_INLINE

src/init.c

@@ -374,7 +374,7 @@ dispatch_get_global_queue(intptr_t priority, uintptr_t flags)
 	dispatch_assert(countof(_dispatch_root_queues) ==
 			DISPATCH_ROOT_QUEUE_COUNT);
 
-	if (flags & ~(uintptr_t)DISPATCH_QUEUE_OVERCOMMIT) {
+	if (flags & ~(unsigned long)DISPATCH_QUEUE_OVERCOMMIT) {
 		return DISPATCH_BAD_INPUT;
 	}
 	dispatch_qos_t qos = _dispatch_qos_from_queue_priority(priority);

src/internal.h

@@ -290,7 +290,6 @@ upcast(dispatch_object_t dou)
 #include <sys/mman.h>
 #include <netinet/in.h>
 #endif
-#include <inttypes.h>
 
 #ifdef __BLOCKS__
 #if __has_include(<Block_private.h>)

src/io.c

@@ -20,6 +20,11 @@
 
 #include "internal.h"
 
+#if defined(__FreeBSD__)
+#include <fcntl.h>
+#define F_RDADVISE F_RDAHEAD
+#endif
+
 #ifndef DISPATCH_IO_DEBUG
 #define DISPATCH_IO_DEBUG DISPATCH_DEBUG
 #endif