libdispatch-1121 merge fixes.

Author: ktopley-apple

dispatch/queue.h

@@ -598,7 +598,7 @@ typedef unsigned int dispatch_qos_class_t;
  */
 API_AVAILABLE(macos(10.6), ios(4.0))
 DISPATCH_EXPORT DISPATCH_CONST DISPATCH_WARN_RESULT DISPATCH_NOTHROW
-dispatch_queue_t
+dispatch_queue_global_t
 dispatch_get_global_queue(intptr_t identifier, uintptr_t flags);
 
 /*!

private/private.h

@@ -226,7 +226,6 @@ API_AVAILABLE(macos(10.9), ios(7.0))
 DISPATCH_EXPORT DISPATCH_WARN_RESULT DISPATCH_NOTHROW
 dispatch_runloop_handle_t
 _dispatch_runloop_root_queue_get_port_4CF(dispatch_queue_t queue);
-#endif
 
 API_AVAILABLE(macos(10.13.2), ios(11.2), tvos(11.2), watchos(4.2))
 DISPATCH_EXPORT DISPATCH_WARN_RESULT DISPATCH_NOTHROW

private/workloop_private.h

@@ -174,7 +174,7 @@ API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
 DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW
 void
 dispatch_workloop_set_qos_class_floor(dispatch_workloop_t workloop,
-		qos_class_t qos, int relpri, dispatch_workloop_param_flags_t flags);
+		dispatch_qos_class_t qos, int relpri, dispatch_workloop_param_flags_t flags);
 
 /*!
  * @function dispatch_workloop_set_scheduler_priority
@@ -273,7 +273,7 @@ API_DEPRECATED_WITH_REPLACEMENT("dispatch_workloop_set_qos_class_floor",
 DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW
 void
 dispatch_workloop_set_qos_class(dispatch_workloop_t workloop,
-		qos_class_t qos, dispatch_workloop_param_flags_t flags);
+		dispatch_qos_class_t qos, dispatch_workloop_param_flags_t flags);
 
 API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
 DISPATCH_EXPORT DISPATCH_NOTHROW

src/event/event_epoll.c

@@ -260,7 +260,6 @@ _dispatch_unote_register_muxed(dispatch_unote_t du)
 	uint32_t events;
 
 	events = _dispatch_unote_required_events(du);
-	du._du->du_priority = pri;
 
 	dmb = _dispatch_unote_muxnote_bucket(du);
 	dmn = _dispatch_unote_muxnote_find(dmb, du);
@@ -429,16 +428,18 @@ _dispatch_timeout_program(uint32_t tidx, uint64_t target,
 }
 
 void
-_dispatch_event_loop_timer_arm(dispatch_timer_heap_t dth, uint32_t tidx,
-		dispatch_timer_delay_s range, dispatch_clock_now_cache_t nows)
+_dispatch_event_loop_timer_arm(dispatch_timer_heap_t dth DISPATCH_UNUSED,
+		uint32_t tidx, dispatch_timer_delay_s range,
+		dispatch_clock_now_cache_t nows)
 {
 	dispatch_clock_t clock = DISPATCH_TIMER_CLOCK(tidx);
 	uint64_t target = range.delay + _dispatch_time_now_cached(clock, nows);
 	_dispatch_timeout_program(tidx, target, range.leeway);
 }
 
 void
-_dispatch_event_loop_timer_delete(dispatch_timer_heap_t dth, uint32_t tidx)
+_dispatch_event_loop_timer_delete(dispatch_timer_heap_t dth DISPATCH_UNUSED,
+		uint32_t tidx)
 {
 	_dispatch_timeout_program(tidx, UINT64_MAX, UINT64_MAX);
 }
@@ -510,7 +511,7 @@ _dispatch_event_merge_signal(dispatch_muxnote_t dmn)
 			// consumed by dux_merge_evt()
 			_dispatch_retain_unote_owner(du);
 			dispatch_assert(!dux_needs_rearm(du._du));
-			os_atomic_store2o(du._dr, ds_pending_data, 1, relaxed)
+			os_atomic_store2o(du._dr, ds_pending_data, 1, relaxed);
 			dux_merge_evt(du._du, EV_ADD|EV_ENABLE|EV_CLEAR, 1, 0);
 		}
 	} else {
@@ -564,8 +565,8 @@ _dispatch_event_merge_fd(dispatch_muxnote_t dmn, uint32_t events)
 			_dispatch_retain_unote_owner(du);
 			dispatch_assert(dux_needs_rearm(du._du));
 			_dispatch_unote_state_clear_bit(du, DU_STATE_ARMED);
-			os_atomic_store2o(du._dr, ds_pending_data, ~data, relaxed)
-			dux_merge_evt(du._du, EV_ADD|EV_ENABLE|EV_DISPATCH, data, 0, 0);
+			os_atomic_store2o(du._dr, ds_pending_data, ~data, relaxed);
+			dux_merge_evt(du._du, EV_ADD|EV_ENABLE|EV_DISPATCH, data, 0);
 		}
 	}
 
@@ -577,8 +578,8 @@ _dispatch_event_merge_fd(dispatch_muxnote_t dmn, uint32_t events)
 			_dispatch_retain_unote_owner(du);
 			dispatch_assert(dux_needs_rearm(du._du));
 			_dispatch_unote_state_clear_bit(du, DU_STATE_ARMED);
-			os_atomic_store2o(du._dr, ds_pending_data, ~data, relaxed)
-			dux_merge_evt(du._du, EV_ADD|EV_ENABLE|EV_DISPATCH, data, 0, 0);
+			os_atomic_store2o(du._dr, ds_pending_data, ~data, relaxed);
+			dux_merge_evt(du._du, EV_ADD|EV_ENABLE|EV_DISPATCH, data, 0);
 		}
 	}
 
@@ -628,10 +629,14 @@ _dispatch_event_loop_drain(uint32_t flags)
 			_dispatch_event_merge_timer(DISPATCH_CLOCK_WALL);
 			break;
 
-		case DISPATCH_EPOLL_CLOCK_MACH:
+		case DISPATCH_EPOLL_CLOCK_UPTIME:
 			_dispatch_event_merge_timer(DISPATCH_CLOCK_UPTIME);
 			break;
 
+		case DISPATCH_EPOLL_CLOCK_MONOTONIC:
+			_dispatch_event_merge_timer(DISPATCH_CLOCK_MONOTONIC);
+			break;
+
 		default:
 			dmn = ev[i].data.ptr;
 			switch (dmn->dmn_filter) {

src/event/event_internal.h

@@ -381,9 +381,9 @@ extern const dispatch_source_type_s _dispatch_mach_type_send;
 extern const dispatch_source_type_s _dispatch_mach_type_recv;
 extern const dispatch_source_type_s _dispatch_mach_type_reply;
 extern const dispatch_source_type_s _dispatch_xpc_type_sigterm;
-extern const dispatch_source_type_s _dispatch_source_type_timer_with_clock;
 #define DISPATCH_MACH_TYPE_WAITER ((const dispatch_source_type_s *)-2)
 #endif
+extern const dispatch_source_type_s _dispatch_source_type_timer_with_clock;
 
 #pragma mark -
 #pragma mark deferred items

src/event/event_kevent.c

@@ -3043,7 +3043,6 @@ _dispatch_mach_notification_set_armed(dispatch_mach_send_refs_t dmsr)
 				(mach_port_name_t)dmn->dmn_kev.ident);
 #endif
 	}
-#endif
 }
 
 static dispatch_unote_t

src/event/workqueue.c

@@ -218,7 +218,7 @@ _dispatch_workq_monitor_pools(void *context DISPATCH_UNUSED)
 			int32_t floor = mon->target_runnable - WORKQ_MAX_TRACKED_TIDS;
 			_dispatch_debug("workq: %s has no runnable workers; poking with floor %d",
 					dq->dq_label, floor);
-			_dispatch_global_queue_poke(dq, 1, floor);
+			_dispatch_root_queue_poke(dq, 1, floor);
 			global_runnable += 1; // account for poke in global estimate
 		} else if (mon->num_runnable < mon->target_runnable &&
 				   global_runnable < global_soft_max) {
@@ -231,7 +231,7 @@ _dispatch_workq_monitor_pools(void *context DISPATCH_UNUSED)
 			floor = MAX(floor, floor2);
 			_dispatch_debug("workq: %s under utilization target; poking with floor %d",
 					dq->dq_label, floor);
-			_dispatch_global_queue_poke(dq, 1, floor);
+			_dispatch_root_queue_poke(dq, 1, floor);
 			global_runnable += 1; // account for poke in global estimate
 		}
 	}
@@ -245,15 +245,15 @@ _dispatch_workq_init_once(void *context DISPATCH_UNUSED)
 	int i, target_runnable = (int)dispatch_hw_config(active_cpus);
 	foreach_qos_bucket_reverse(i) {
 		dispatch_workq_monitor_t mon = &_dispatch_workq_monitors[i];
-		mon->dq = _dispatch_get_root_queue(i, false);
+		mon->dq = _dispatch_get_root_queue(DISPATCH_QOS_FOR_BUCKET(i), false);
 		void *buf = _dispatch_calloc(WORKQ_MAX_TRACKED_TIDS, sizeof(dispatch_tid));
 		mon->registered_tids = buf;
 		mon->target_runnable = target_runnable;
 	}
 
 	// Create monitoring timer that will periodically run on dispatch_mgr_q
 	dispatch_source_t ds = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,
-			0, 0, &_dispatch_mgr_q);
+			0, 0, _dispatch_mgr_q._as_dq);
 	dispatch_source_set_timer(ds, dispatch_time(DISPATCH_TIME_NOW, 0),
 			NSEC_PER_SEC, 0);
 	dispatch_source_set_event_handler_f(ds, _dispatch_workq_monitor_pools);

src/init.c

@@ -362,7 +362,7 @@ unsigned long volatile _dispatch_queue_serial_numbers =
 
 
 dispatch_queue_global_t
-dispatch_get_global_queue(long priority, unsigned long flags)
+dispatch_get_global_queue(intptr_t priority, uintptr_t flags)
 {
 	dispatch_assert(countof(_dispatch_root_queues) ==
 			DISPATCH_ROOT_QUEUE_COUNT);
@@ -432,6 +432,12 @@ _dispatch_queue_attr_to_info(dispatch_queue_attr_t dqa)
 
 	if (dqa < _dispatch_queue_attrs ||
 			dqa >= &_dispatch_queue_attrs[DISPATCH_QUEUE_ATTR_COUNT]) {
+#ifndef __APPLE__
+		if (memcmp(dqa, &_dispatch_queue_attrs[0],
+				sizeof(struct dispatch_queue_attr_s)) == 0) {
+			dqa = (dispatch_queue_attr_t)&_dispatch_queue_attrs[0];
+		} else
+#endif // __APPLE__
 		DISPATCH_CLIENT_CRASH(dqa->do_vtable, "Invalid queue attribute");
 	}
 
@@ -443,7 +449,7 @@ _dispatch_queue_attr_to_info(dispatch_queue_attr_t dqa)
 	dqai.dqai_concurrent = !(idx % DISPATCH_QUEUE_ATTR_CONCURRENCY_COUNT);
 	idx /= DISPATCH_QUEUE_ATTR_CONCURRENCY_COUNT;
 
-	dqai.dqai_relpri = -(idx % DISPATCH_QUEUE_ATTR_PRIO_COUNT);
+	dqai.dqai_relpri = -(int)(idx % DISPATCH_QUEUE_ATTR_PRIO_COUNT);
 	idx /= DISPATCH_QUEUE_ATTR_PRIO_COUNT;
 
 	dqai.dqai_qos = idx % DISPATCH_QUEUE_ATTR_QOS_COUNT;
@@ -965,28 +971,30 @@ _dispatch_bug_kevent_client(const char *msg, const char *filter,
 			dc = du._dr->ds_handler[DS_EVENT_HANDLER];
 			if (dc) func = _dispatch_continuation_get_function_symbol(dc);
 			break;
+#if HAVE_MACH
 		case DISPATCH_MACH_CHANNEL_TYPE:
 			func = du._dmrr->dmrr_handler_func;
 			break;
+#endif // HAVE_MACH
 		}
 		filter = dux_type(du._du)->dst_kind;
 	}
 
 	if (operation && err) {
 		_dispatch_log_fault("LIBDISPATCH_STRICT: _dispatch_bug_kevent_client",
 				"BUG in libdispatch client: %s %s: \"%s\" - 0x%x "
-				"{ 0x%llx[%s], ident: %lld / 0x%llx, handler: %p }",
+				"{ 0x%"PRIx64"[%s], ident: %"PRId64" / 0x%"PRIx64", handler: %p }",
 				msg, operation, strerror(err), err,
 				udata, filter, ident, ident, func);
 	} else if (operation) {
 		_dispatch_log_fault("LIBDISPATCH_STRICT: _dispatch_bug_kevent_client",
 				"BUG in libdispatch client: %s %s"
-				"{ 0x%llx[%s], ident: %lld / 0x%llx, handler: %p }",
+				"{ 0x%"PRIx64"[%s], ident: %"PRId64" / 0x%"PRIx64", handler: %p }",
 				msg, operation, udata, filter, ident, ident, func);
 	} else {
 		_dispatch_log_fault("LIBDISPATCH_STRICT: _dispatch_bug_kevent_client",
 				"BUG in libdispatch: %s: \"%s\" - 0x%x"
-				"{ 0x%llx[%s], ident: %lld / 0x%llx, handler: %p }",
+				"{ 0x%"PRIx64"[%s], ident: %"PRId64" / 0x%"PRIx64", handler: %p }",
 				msg, strerror(err), err, udata, filter, ident, ident, func);
 	}
 }
@@ -1004,9 +1012,11 @@ _dispatch_bug_kevent_vanished(dispatch_unote_t du)
 		dc = du._dr->ds_handler[DS_EVENT_HANDLER];
 		if (dc) func = _dispatch_continuation_get_function_symbol(dc);
 		break;
+ #if HAVE_MACH
 	case DISPATCH_MACH_CHANNEL_TYPE:
 		func = du._dmrr->dmrr_handler_func;
 		break;
+#endif // MACH
 	}
 	_dispatch_log_fault("LIBDISPATCH_STRICT: _dispatch_bug_kevent_vanished",
 			"BUG in libdispatch client: %s, monitored resource vanished before "

src/inline_internal.h

@@ -2049,7 +2049,7 @@ _dispatch_set_basepri(dispatch_priority_t dq_dbp)
 	_dispatch_thread_setspecific(dispatch_basepri_key, (void*)(uintptr_t)dbp);
 	return old_dbp;
 #else
-	(void)dbp;
+	(void)dq_dbp;
 	return 0;
 #endif
 }

src/internal.h

@@ -318,6 +318,7 @@ upcast(dispatch_object_t dou)
 #include <io.h>
 #include <crtdbg.h>
 #endif
+#include <inttypes.h>
 
 /* More #includes at EOF (dependent on the contents of internal.h) ... */