merge darwin/libdispatch-1324.41.2

Signed-off-by: Rokhini Prabhu <rokhinip@apple.com>

Author: rokhinip

CMakeLists.txt

@@ -40,6 +40,20 @@ int main(int argc, char *argv[]) {
   if(DISPATCH_HAVE_EXTENDED_SLPI_20348)
     add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_20348)
   endif()
+
+  check_c_source_compiles([=[
+#include <Windows.h>
+int main(int argc, char *argv[]) {
+  switch ((LOGICAL_PROCESSOR_RELATIONSHIP)0) {
+  case RelationProcessorModule:
+    return 0;
+  }
+  return 0;
+}
+]=] DISPATCH_HAVE_EXTENDED_SLPI_22000)
+  if(DISPATCH_HAVE_EXTENDED_SLPI_22000)
+    add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_22000)
+  endif()
 endif()
 
 set(CMAKE_C_STANDARD 11)

PATCHES

@@ -434,3 +434,113 @@ github commits starting with 29bdc2f from
 [3975b58] APPLIED rdar://44568645
 [81dc900] APPLIED rdar://44568645
 [6162a1d] APPLIED rdar://44568645
+[c55ff6f] APPLIED rdar://54572081
+[c4a7149] APPLIED rdar://54572081
+[edce1fe] APPLIED rdar://54572081
+[ac525a4] APPLIED rdar://54572081
+[0710b29] APPLIED rdar://54572081
+[e99de71] APPLIED rdar://54572081
+[6d83ad5] APPLIED rdar://54572081
+[3ed78b5] APPLIED rdar://54572081
+[f6376cb] APPLIED rdar://54572081
+[9acbab3] APPLIED rdar://54572081
+[ca08b5f] APPLIED rdar://54572081
+[775f9f2] APPLIED rdar://54572081
+[db37bbc] APPLIED rdar://54572081
+[9852dcb] APPLIED rdar://54572081
+[9ec95bf] APPLIED rdar://54572081
+[bd2367c] APPLIED rdar://54572081
+[a736ea7] APPLIED rdar://54572081
+[3e4ea66] APPLIED rdar://54572081
+[c85c0d8] APPLIED rdar://54572081
+[7187ea2] APPLIED rdar://54572081
+[30eeb14] APPLIED rdar://54572081
+[6a5c6d8] APPLIED rdar://54572081
+[64a12c6] APPLIED rdar://54572081
+[09ec354] APPLIED rdar://54572081
+[5bcd598] APPLIED rdar://54572081
+[7874a92] APPLIED rdar://54572081
+[619775e] APPLIED rdar://54572081
+[e3ae79b] APPLIED rdar://54572081
+[fb368f6] APPLIED rdar://54572081
+[afa6cc3] APPLIED rdar://54572081
+[e6df818] APPLIED rdar://54572081
+[7144ee3] APPLIED rdar://54572081
+[60ffcc2] APPLIED rdar://54572081
+[618b070] APPLIED rdar://54572081
+[dde5892] APPLIED rdar://54572081
+[81c9bf6] APPLIED rdar://54572081
+[4b85ca6] APPLIED rdar://54572081
+[ff3bf51] APPLIED rdar://54572081
+[bc00e13] APPLIED rdar://54572081
+[d44acc0] APPLIED rdar://54572081
+[4659503] APPLIED rdar://54572081
+[60fdf80] APPLIED rdar://54572081
+[7a74af4] APPLIED rdar://54572081
+[f20349f] APPLIED rdar://54572081
+[ef9364c] APPLIED rdar://54572081
+[9d485ca] APPLIED rdar://54572081
+[cbd70d1] APPLIED rdar://54572081
+[6e1825a] APPLIED rdar://54572081
+[319bd33] APPLIED rdar://54572081
+[6c5b3ba] APPLIED rdar://54572081
+[7e7677b] APPLIED rdar://54572081
+[9002f70] APPLIED rdar://54572081
+[cc04868] APPLIED rdar://54572081
+[dc0dd64] APPLIED rdar://54572081
+[a5f5a92] APPLIED rdar://54572081
+[e5ba042] APPLIED rdar://54572081
+[a3bff44] APPLIED rdar://54572081
+[2e3d5c0] APPLIED rdar://54572081
+[1482ec9] APPLIED rdar://54572081
+[6bf6cb1] APPLIED rdar://54572081
+[aa13cad] APPLIED rdar://54572081
+[b073d89] APPLIED rdar://54572081
+[7784917] APPLIED rdar://54572081
+[717b3f7] APPLIED rdar://54572081
+[37010f0] APPLIED rdar://54572081
+[251dba4] APPLIED rdar://54572081
+[a18aa1f] APPLIED rdar://54572081
+[e8d020e] APPLIED rdar://54572081
+[90a84a1] APPLIED rdar://54572081
+[7721660] APPLIED rdar://54572081
+[c5af10f] APPLIED rdar://54572081
+[f01432d] APPLIED rdar://54572081
+[d0394bf] APPLIED rdar://54572081
+[2b14a98] APPLIED rdar://54572081
+[d32596b] APPLIED rdar://54572081
+[52bc6b2] APPLIED rdar://54572081
+[4169c8d] APPLIED rdar://54572081
+[318f6e5] APPLIED rdar://54572081
+[6a36af8] APPLIED rdar://54572081
+[d11d565] APPLIED rdar://54572081
+[d9740c2] APPLIED rdar://54572081
+[fc917b4] APPLIED rdar://54572081
+[f911a44] APPLIED rdar://54572081
+[6d32c4d] APPLIED rdar://54572081
+[9005cb4] APPLIED rdar://54572081
+[68875cb] APPLIED rdar://54572081
+[fc73866] APPLIED rdar://54572081
+[3cf1bf3] APPLIED rdar://54572081
+[3da29dd] APPLIED rdar://81276248
+[90a45ce] APPLIED rdar://81276248
+[37c8c28] APPLIED rdar://81276248
+[c023edd] APPLIED rdar://81276248
+[ab8a151] APPLIED rdar://81276248
+[c66cb25] APPLIED rdar://81276248
+[289e552] APPLIED rdar://81276248
+[afd6b6d] APPLIED rdar://81276248
+[4c91d20] APPLIED rdar://81276248
+[2accb0b] APPLIED rdar://81276248
+[b0b314c] APPLIED rdar://81276248
+[c992dac] APPLIED rdar://81276248
+[80b1772] APPLIED rdar://81276248
+[1986f39] APPLIED rdar://81276248
+[598ce42] APPLIED rdar://81276248
+[feb4421] APPLIED rdar://81276248
+[f152471] APPLIED rdar://81276248
+[457b110] APPLIED rdar://81276248
+[f13ea5d] APPLIED rdar://81276248
+[1c303fa] APPLIED rdar://81276248
+[34f383d] APPLIED rdar://81276248
+[7870521] APPLIED rdar://81276248

config/config.h

@@ -61,6 +61,10 @@
    you don't. */
 #define HAVE_DECL_VQ_VERYLOWDISK 1
 
+/* Define to 1 if you have the declaration of `VQ_SERVEREVENT', and to 0 if
+   you don't. */
+#define HAVE_DECL_VQ_SERVEREVENT 1
+
 /* Define to 1 if you have the declaration of `VQ_QUOTA', and to 0 if
  you don't. */
 #define HAVE_DECL_VQ_QUOTA 1
@@ -73,10 +77,6 @@
  you don't. */
 #define HAVE_DECL_VQ_DESIRED_DISK 1
 
-/* Define to 1 if you have the declaration of `VQ_FREE_SPACE_CHANGE', and to 0 if
-   you don't. */
-#define HAVE_DECL_VQ_FREE_SPACE_CHANGE 1
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -125,6 +125,12 @@
 /* Define if you have the Objective-C runtime */
 #define HAVE_OBJC 1
 
+/* Define to 1 if you have the `posix_fadvise' function. */
+#define HAVE_POSIX_FADVISE 0
+
+/* Define to 1 if you have the `posix_spawnp' function. */
+#define HAVE_POSIX_SPAWNP 1
+
 /* Define to 1 if you have the `pthread_key_init_np' function. */
 #define HAVE_PTHREAD_KEY_INIT_NP 1
 

dispatch/base.h

@@ -264,13 +264,35 @@
 #endif
 #endif
 
-#if __has_feature(objc_fixed_enum) || __has_extension(cxx_strong_enums) || defined(_WIN32)
+#if __has_attribute(enum_extensibility)
+#define __DISPATCH_ENUM_ATTR __attribute__((__enum_extensibility__(open)))
+#define __DISPATCH_ENUM_ATTR_CLOSED __attribute__((__enum_extensibility__(closed)))
+#else
+#define __DISPATCH_ENUM_ATTR
+#define __DISPATCH_ENUM_ATTR_CLOSED
+#endif // __has_attribute(enum_extensibility)
+
+#if __has_attribute(flag_enum)
+#define __DISPATCH_OPTIONS_ATTR __attribute__((__flag_enum__))
+#else
+#define __DISPATCH_OPTIONS_ATTR
+#endif // __has_attribute(flag_enum)
+
+
+#if __has_feature(objc_fixed_enum) || __has_extension(cxx_strong_enums) || \
+		__has_extension(cxx_fixed_enum) || defined(_WIN32)
 #define DISPATCH_ENUM(name, type, ...) \
-		typedef enum : type { __VA_ARGS__ } name##_t
+		typedef enum : type { __VA_ARGS__ } __DISPATCH_ENUM_ATTR name##_t
+#define DISPATCH_OPTIONS(name, type, ...) \
+		typedef enum : type { __VA_ARGS__ } __DISPATCH_OPTIONS_ATTR __DISPATCH_ENUM_ATTR name##_t
 #else
 #define DISPATCH_ENUM(name, type, ...) \
-		enum { __VA_ARGS__ }; typedef type name##_t
-#endif
+		enum { __VA_ARGS__ } __DISPATCH_ENUM_ATTR; typedef type name##_t
+#define DISPATCH_OPTIONS(name, type, ...) \
+		enum { __VA_ARGS__ } __DISPATCH_OPTIONS_ATTR __DISPATCH_ENUM_ATTR; typedef type name##_t
+#endif // __has_feature(objc_fixed_enum) ...
+
+
 
 #if __has_feature(enumerator_attributes)
 #define DISPATCH_ENUM_API_AVAILABLE(...) API_AVAILABLE(__VA_ARGS__)
@@ -283,12 +305,11 @@
 #define DISPATCH_ENUM_API_DEPRECATED_WITH_REPLACEMENT(...)
 #endif
 
-#if defined(SWIFT_SDK_OVERLAY_DISPATCH_EPOCH) && \
-		SWIFT_SDK_OVERLAY_DISPATCH_EPOCH >= 2
+#ifdef __swift__
 #define DISPATCH_SWIFT3_OVERLAY 1
-#else
+#else // __swift__
 #define DISPATCH_SWIFT3_OVERLAY 0
-#endif // SWIFT_SDK_OVERLAY_DISPATCH_EPOCH >= 2
+#endif // __swift__
 
 #if __has_feature(attribute_availability_swift)
 #define DISPATCH_SWIFT_UNAVAILABLE(_msg) \

dispatch/block.h

@@ -100,7 +100,7 @@ __BEGIN_DECLS
  * for synchronous execution or when the dispatch block object is invoked
  * directly.
  */
-DISPATCH_ENUM(dispatch_block_flags, unsigned long,
+DISPATCH_OPTIONS(dispatch_block_flags, unsigned long,
 	DISPATCH_BLOCK_BARRIER
 			DISPATCH_ENUM_API_AVAILABLE(macos(10.10), ios(8.0)) = 0x1,
 	DISPATCH_BLOCK_DETACHED

dispatch/dispatch.h

@@ -54,14 +54,15 @@
 #endif
 #endif
 
-#define DISPATCH_API_VERSION 20180109
+#define DISPATCH_API_VERSION 20181008
 
 #ifndef __DISPATCH_BUILDING_DISPATCH__
 #ifndef __DISPATCH_INDIRECT__
 #define __DISPATCH_INDIRECT__
 #endif
 
 #include <os/object.h>
+#include <os/workgroup.h>
 #include <dispatch/base.h>
 #include <dispatch/time.h>
 #include <dispatch/object.h>
@@ -73,6 +74,7 @@
 #include <dispatch/once.h>
 #include <dispatch/data.h>
 #include <dispatch/io.h>
+#include <dispatch/workloop.h>
 
 #undef __DISPATCH_INDIRECT__
 #endif /* !__DISPATCH_BUILDING_DISPATCH__ */

dispatch/object.h

@@ -26,6 +26,10 @@
 #include <dispatch/base.h> // for HeaderDoc
 #endif
 
+#if __has_include(<sys/qos.h>)
+#include <sys/qos.h>
+#endif
+
 DISPATCH_ASSUME_NONNULL_BEGIN
 
 /*!
@@ -95,6 +99,7 @@ typedef union {
 	struct dispatch_queue_attr_s *_dqa;
 	struct dispatch_group_s *_dg;
 	struct dispatch_source_s *_ds;
+	struct dispatch_channel_s *_dch;
 	struct dispatch_mach_s *_dm;
 	struct dispatch_mach_msg_s *_dmsg;
 	struct dispatch_semaphore_s *_dsema;
@@ -178,6 +183,16 @@ typedef void (^dispatch_block_t)(void);
 
 __BEGIN_DECLS
 
+/*!
+ * @typedef dispatch_qos_class_t
+ * Alias for qos_class_t type.
+ */
+#if __has_include(<sys/qos.h>)
+typedef qos_class_t dispatch_qos_class_t;
+#else
+typedef unsigned int dispatch_qos_class_t;
+#endif
+
 /*!
  * @function dispatch_retain
  *
@@ -374,6 +389,49 @@ DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW
 void
 dispatch_resume(dispatch_object_t object);
 
+/*!
+ * @function dispatch_set_qos_class_floor
+ *
+ * @abstract
+ * Sets the QOS class floor on a dispatch queue, source or workloop.
+ *
+ * @discussion
+ * The QOS class of workitems submitted to this object asynchronously will be
+ * elevated to at least the specified QOS class floor. The QOS of the workitem
+ * will be used if higher than the floor even when the workitem has been created
+ * without "ENFORCE" semantics.
+ *
+ * Setting the QOS class floor is equivalent to the QOS effects of configuring
+ * a queue whose target queue has a QoS class set to the same value.
+ *
+ * @param object
+ * A dispatch queue, workloop, or source to configure.
+ * The object must be inactive.
+ *
+ * Passing another object type or an object that has been activated is undefined
+ * and will cause the process to be terminated.
+ *
+ * @param qos_class
+ * A QOS class value:
+ *  - QOS_CLASS_USER_INTERACTIVE
+ *  - QOS_CLASS_USER_INITIATED
+ *  - QOS_CLASS_DEFAULT
+ *  - QOS_CLASS_UTILITY
+ *  - QOS_CLASS_BACKGROUND
+ * Passing any other value is undefined.
+ *
+ * @param relative_priority
+ * A relative priority within the QOS class. This value is a negative
+ * offset from the maximum supported scheduler priority for the given class.
+ * Passing a value greater than zero or less than QOS_MIN_RELATIVE_PRIORITY
+ * is undefined.
+ */
+API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
+DISPATCH_EXPORT DISPATCH_NOTHROW
+void
+dispatch_set_qos_class_floor(dispatch_object_t object,
+		dispatch_qos_class_t qos_class, int relative_priority);
+
 #ifdef __BLOCKS__
 /*!
  * @function dispatch_wait