Merge libdispatch-1324.41.2

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

Author: rokhinip

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
@@ -121,15 +125,27 @@
 /* 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
 
+/* Define to 1 if you have the `pthread_attr_setcpupercent_np' function. */
+#define HAVE_PTHREAD_ATTR_SETCPUPERCENT_NP 1
+
 /* Define to 1 if you have the <pthread_machdep.h> header file. */
 #define HAVE_PTHREAD_MACHDEP_H 1
 
 /* Define to 1 if you have the `pthread_main_np' function. */
 #define HAVE_PTHREAD_MAIN_NP 1
 
+/* Define to 1 if you have the `pthread_yield_np' function. */
+#define HAVE_PTHREAD_YIELD_NP 1
+
 /* Define to 1 if you have the <pthread_np.h> header file. */
 /* #undef HAVE_PTHREAD_NP_H */
 

dispatch/dispatch.h

@@ -62,6 +62,7 @@
 #endif
 
 #include <os/object.h>
+#include <os/workgroup.h>
 #include <dispatch/base.h>
 #include <dispatch/time.h>
 #include <dispatch/object.h>

dispatch/queue.h

@@ -496,7 +496,7 @@ DISPATCH_EXPORT DISPATCH_NONNULL3 DISPATCH_NOTHROW
 void
 dispatch_apply(size_t iterations,
 		dispatch_queue_t DISPATCH_APPLY_QUEUE_ARG_NULLABILITY queue,
-		DISPATCH_NOESCAPE void (^block)(size_t));
+		DISPATCH_NOESCAPE void (^block)(size_t iteration));
 #endif
 
 /*!
@@ -531,7 +531,7 @@ DISPATCH_EXPORT DISPATCH_NONNULL4 DISPATCH_NOTHROW
 void
 dispatch_apply_f(size_t iterations,
 		dispatch_queue_t DISPATCH_APPLY_QUEUE_ARG_NULLABILITY queue,
-		void *_Nullable context, void (*work)(void *_Nullable, size_t));
+		void *_Nullable context, void (*work)(void *_Nullable context, size_t iteration));
 
 /*!
  * @function dispatch_get_current_queue

dispatch/workloop.h

@@ -133,6 +133,33 @@ void
 dispatch_workloop_set_autorelease_frequency(dispatch_workloop_t workloop,
 		dispatch_autorelease_frequency_t frequency);
 
+/*!
+  * @function dispatch_workloop_set_os_workgroup
+  *
+  * @abstract
+  * Associates an os_workgroup_t with the specified dispatch workloop.
+  *
+  * The worker thread will be a member of the specified os_workgroup_t while executing
+  * work items submitted to the workloop.
+  *
+  * @param workloop
+  * The dispatch workloop to modify.
+  *
+  * This workloop must be inactive, passing an activated object is undefined
+  * and will cause the process to be terminated.
+  *
+  * @param workgroup
+  * The workgroup to associate with this workloop.
+  *
+  * The workgroup specified is retained and the previously associated workgroup
+  * (if any) is released.
+  */
+API_AVAILABLE(macos(10.16), ios(14.0), tvos(14.0), watchos(7.0))
+DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW
+void
+dispatch_workloop_set_os_workgroup(dispatch_workloop_t workloop,
+		os_workgroup_t workgroup);
+
 __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END

libdispatch.xcodeproj/project.pbxproj

@@ -13,14 +13,16 @@ concurrent execution via the core functions described in
 .Xr dispatch_async 3 and
 .Xr dispatch_apply 3 .
 .Pp
-Dispatch queues are the basic units of organization of blocks. Several queues
-are created by default, and applications may create additional queues for their
-own use. See
+Dispatch queues are the basic units of organization of blocks.
+Several queues are created by default, and applications may create additional
+queues for their own use.
+See
 .Xr dispatch_queue_create 3
 for more information.
 .Pp
 Dispatch groups allow applications to track the progress of blocks submitted to
-queues and take action when the blocks complete. See
+queues and take action when the blocks complete.
+See
 .Xr dispatch_group_create 3
 for more information.
 .Pp

man/dispatch.3

@@ -40,6 +40,15 @@ and the time at which the function is called, with the leeway capped to at least
 .Pp
 For a more detailed description about submitting blocks to queues, see
 .Xr dispatch_async 3 .
+.Sh FUNDAMENTALS
+The
+.Fn dispatch_after
+function is a wrapper around
+.Fn dispatch_after_f .
+.Sh SEE ALSO
+.Xr dispatch 3 ,
+.Xr dispatch_async 3 ,
+.Xr dispatch_time 3
 .Sh CAVEATS
 .Fn dispatch_after
 retains the passed queue.
@@ -57,13 +66,3 @@ The result of passing
 as the
 .Fa when
 parameter is undefined.
-.Pp
-.Sh FUNDAMENTALS
-The
-.Fn dispatch_after
-function is a wrapper around
-.Fn dispatch_after_f .
-.Sh SEE ALSO
-.Xr dispatch 3 ,
-.Xr dispatch_async 3 ,
-.Xr dispatch_time 3

man/dispatch_after.3

@@ -11,15 +11,17 @@ consider when designing and implementing API in terms of dispatch queues
 and blocks.
 .Pp
 A general recommendation is to allow both a callback block and target dispatch
-queue to be specified. This gives the application the greatest flexibility in
-handling asynchronous events.
+queue to be specified.
+This gives the application the greatest flexibility in handling asynchronous
+events.
 .Pp
 It's also recommended that interfaces take only a single block as the last
-parameter. This is both for consistency across projects, as well as the visual
-aesthetics of multiline blocks that are declared inline. The dispatch queue to
-which the block will be submitted should immediately precede the block argument
-(second-to-last argument). For example:
-.Pp
+parameter.
+This is both for consistency across projects, as well as the visual aesthetics
+of multiline blocks that are declared inline.
+The dispatch queue to which the block will be submitted should immediately
+precede the block argument (second-to-last argument).
+For example:
 .Bd -literal -offset indent
 read_async(file, callback_queue, ^{
 	printf("received callback.\\n");
@@ -34,10 +36,8 @@ pointer, and a new last parameter is added, which is the function to call.
 The function based callback should pass the context pointer as the first
 argument, and the subsequent arguments should be identical to the block based
 variant (albeit offset by one in order).
-.Pp
-It is also important to use consistent naming. The dispatch API, for example,
-uses the suffix "_f" for function based variants.
-.Pp
+It is also important to use consistent naming.
+The dispatch API, for example, uses the suffix "_f" for function based variants.
 .Sh SEE ALSO
 .Xr dispatch 3 ,
 .Xr dispatch_async 3 ,

man/dispatch_api.3

@@ -30,14 +30,14 @@ dispatch_apply(iterations, DISPATCH_APPLY_AUTO, ^(size_t idx) {
 });
 .Ed
 .Pp
-Although any queue can be used, it is strongly recommended to use 
+Although any queue can be used, it is strongly recommended to use
 .Vt DISPATCH_APPLY_AUTO
-as the 
-.Vt queue 
+as the
+.Vt queue
 argument to both
 .Fn dispatch_apply
 and
-.Fn dispatch_apply_f , 
+.Fn dispatch_apply_f ,
 as shown in the example above, since this allows the system to automatically use worker threads
 that match the configuration of the current thread as closely as possible.
 No assumptions should be made about which global concurrent queue will be used.
@@ -75,7 +75,8 @@ for (i = count - (count % STRIDE); i < count; i++) {
 .Ed
 .Sh IMPLIED REFERENCES
 Synchronous functions within the dispatch framework hold an implied reference
-on the target queue. In other words, the synchronous function borrows the
+on the target queue.
+In other words, the synchronous function borrows the
 reference of the calling function (this is valid because the calling function
 is blocked waiting for the result of the synchronous function, and therefore
 cannot modify the reference count of the target queue until after the
@@ -95,7 +96,7 @@ or
 .Fn dispatch_async_f
 will incur more overhead and does not express the desired parallel execution semantics to
 the system, so may not create an optimal number of worker threads for a parallel workload.
-For this reason, prefer to use 
+For this reason, prefer to use
 .Fn dispatch_apply
 or
 .Fn dispatch_apply_f
@@ -105,18 +106,18 @@ The
 .Fn dispatch_apply
 function is a wrapper around
 .Fn dispatch_apply_f .
+.Sh SEE ALSO
+.Xr dispatch 3 ,
+.Xr dispatch_async 3 ,
+.Xr dispatch_queue_create 3
 .Sh CAVEATS
 Unlike
 .Fn dispatch_async ,
 a block submitted to
 .Fn dispatch_apply
 is expected to be either independent or dependent
 .Em only
-on work already performed in lower-indexed invocations of the block. If
-the block's index dependency is non-linear, it is recommended to
-use a for-loop around invocations of
+on work already performed in lower-indexed invocations of the block.
+If the block's index dependency is non-linear, it is recommended to use a
+for-loop around invocations of
 .Fn dispatch_async .
-.Sh SEE ALSO
-.Xr dispatch 3 ,
-.Xr dispatch_async 3 ,
-.Xr dispatch_queue_create 3