Merge libdispatch-1186

Signed-off-by: Rokhini Prabhu <[email protected]>

Author: rokhinip

cmake/modules/DispatchCompilerWarnings.cmake

@@ -38,7 +38,7 @@ else()
     add_compile_options(-Wsign-conversion)
     add_compile_options(-Wstatic-in-inline)
     add_compile_options(-Wsuper-class-method-mismatch)
-    add_compile_options(-Wswitch-enum)
+    add_compile_options(-Wswitch)
     add_compile_options(-Wunguarded-availability)
     add_compile_options(-Wunreachable-code)
     add_compile_options(-Wunused)

dispatch/base.h

@@ -237,13 +237,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__)
@@ -256,12 +278,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

@@ -50,7 +50,7 @@
 #endif
 #endif
 
-#define DISPATCH_API_VERSION 20180109
+#define DISPATCH_API_VERSION 20181008
 
 #ifndef __DISPATCH_BUILDING_DISPATCH__
 #ifndef __DISPATCH_INDIRECT__
@@ -69,6 +69,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