Linux build fixes

define WORKQ_ADDTHREADS_OPTION_OVERCOMMIT for DISPATCH_USE_INTERNAL_WORKQUEUE
remove unused _swift_dispatch_apply_current_root_queue symbol
remove duplicate _dispatch_adopt_wlh_anon() in _dispatch_mgr_thread(), this is already set by its caller _dispatch_root_queue_drain()

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: das

src/event/workqueue_internal.h

@@ -37,6 +37,8 @@
 
 #define WORKQ_NUM_PRIORITIES 6
 
+#define WORKQ_ADDTHREADS_OPTION_OVERCOMMIT 0x1
+
 #define DISPATCH_WORKQ_MAX_PTHREAD_COUNT 255
 
 void _dispatch_workq_worker_register(dispatch_queue_t root_q, int priority);

src/internal.h

@@ -454,7 +454,7 @@ void _dispatch_log(const char *msg, ...);
  * For reporting bugs within libdispatch when using the "_debug" version of the
  * library.
  */
-#if __GNUC__
+#if __APPLE__
 #define dispatch_assert(e) do { \
 		if (__builtin_constant_p(e)) { \
 			dispatch_static_assert(e); \
@@ -472,7 +472,7 @@ static inline void _dispatch_assert(long e, long line) {
 #define dispatch_assert(e) _dispatch_assert((long)(e), __LINE__)
 #endif	/* __GNUC__ */
 
-#if __GNUC__
+#if __APPLE__
 /*
  * A lot of API return zero upon success and not-zero on fail. Let's capture
  * and log the non-zero value
@@ -491,7 +491,7 @@ static inline void _dispatch_assert(long e, long line) {
 static inline void _dispatch_assert_zero(long e, long line) {
 	if (DISPATCH_DEBUG && e) _dispatch_abort(line, e);
 }
-#define dispatch_assert_zero(e) _dispatch_assert((long)(e), __LINE__)
+#define dispatch_assert_zero(e) _dispatch_assert_zero((long)(e), __LINE__)
 #endif	/* __GNUC__ */
 
 /*

src/queue.c

@@ -4523,10 +4523,12 @@ _dispatch_return_to_kernel(void)
 void
 _dispatch_poll_for_events_4launchd(void)
 {
+#if DISPATCH_USE_KEVENT_WORKQUEUE
 	if (_dispatch_get_wlh()) {
 		dispatch_assert(_dispatch_deferred_items_get()->ddi_wlh_servicing);
 		_dispatch_event_loop_drain(KEVENT_FLAG_IMMEDIATE);
 	}
+#endif
 }
 
 #if HAVE_PTHREAD_WORKQUEUE_NARROWING

src/shims/lock.c

@@ -601,9 +601,9 @@ _dispatch_gate_wait_slow(dispatch_gate_t dgl, dispatch_lock value,
 #if HAVE_UL_UNFAIR_LOCK
 		_dispatch_unfair_lock_wait(&dgl->dgl_lock, new_value, 0, flags);
 #elif HAVE_FUTEX
-		_dispatch_futex_wait(&dgl->dgl_lock, tid_new, NULL, FUTEX_PRIVATE_FLAG);
+		_dispatch_futex_wait(&dgl->dgl_lock, new_value, NULL, FUTEX_PRIVATE_FLAG);
 #else
-		_dispatch_thread_switch(tid_new, flags, timeout++);
+		_dispatch_thread_switch(new_value, flags, timeout++);
 #endif
 		(void)timeout;
 	}

src/source.c

@@ -2321,7 +2321,6 @@ _dispatch_mgr_thread(dispatch_queue_t dq DISPATCH_UNUSED,
 	}
 #endif
 #if DISPATCH_USE_MGR_THREAD
-	_dispatch_adopt_wlh_anon();
 	_dispatch_queue_set_current(&_dispatch_mgr_q);
 	_dispatch_mgr_priority_init();
 	_dispatch_queue_mgr_lock(&_dispatch_mgr_q);

src/swift/Queue.swift

@@ -344,8 +344,5 @@ internal func _swift_dispatch_queue_concurrent() -> dispatch_queue_attr_t
 @_silgen_name("_swift_dispatch_get_main_queue")
 internal func _swift_dispatch_get_main_queue() -> dispatch_queue_t
 
-@_silgen_name("_swift_dispatch_apply_current_root_queue")
-internal func _swift_dispatch_apply_current_root_queue() -> dispatch_queue_t
-
 @_silgen_name("_swift_dispatch_apply_current")
 internal func _swift_dispatch_apply_current(_ iterations: Int, _ block: @convention(block) (Int) -> Void)