Updates for 1121 release for Windows

Make the 1121 release build on Windows.  This is sufficient for getting
a basic Hello World dispatch program to run under swift again.

Author: compnerd

src/event/event_windows.c

@@ -24,23 +24,20 @@
 #pragma mark dispatch_unote_t
 
 bool
-_dispatch_unote_register(dispatch_unote_t du DISPATCH_UNUSED,
-		dispatch_wlh_t wlh DISPATCH_UNUSED,
-		dispatch_priority_t pri DISPATCH_UNUSED)
+_dispatch_unote_register_muxed(dispatch_unote_t du DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 	return false;
 }
 
 void
-_dispatch_unote_resume(dispatch_unote_t du DISPATCH_UNUSED)
+_dispatch_unote_resume_muxed(dispatch_unote_t du DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 }
 
 bool
-_dispatch_unote_unregister(dispatch_unote_t du DISPATCH_UNUSED,
-		uint32_t flags DISPATCH_UNUSED)
+_dispatch_unote_unregister_muxed(dispatch_unote_t du DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 	return false;
@@ -49,31 +46,65 @@ _dispatch_unote_unregister(dispatch_unote_t du DISPATCH_UNUSED,
 #pragma mark timers
 
 void
-_dispatch_event_loop_timer_arm(uint32_t tidx DISPATCH_UNUSED,
+_dispatch_event_loop_timer_arm(dispatch_timer_heap_t dth DISPATCH_UNUSED,
+		uint32_t tidx DISPATCH_UNUSED,
 		dispatch_timer_delay_s range DISPATCH_UNUSED,
 		dispatch_clock_now_cache_t nows DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 }
 
 void
-_dispatch_event_loop_timer_delete(uint32_t tidx DISPATCH_UNUSED)
+_dispatch_event_loop_timer_delete(dispatch_timer_heap_t dth DISPATCH_UNUSED,
+		uint32_t tidx DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 }
 
 #pragma mark dispatch_loop
 
+static HANDLE hSomething = INVALID_HANDLE_VALUE;
+
+static void
+_dispatch_something_init(void *context DISPATCH_UNUSED)
+{
+	hSomething = CreateEventW(NULL, /*bManualReset=*/TRUE,
+		/*bInitialState=*/FALSE, NULL);
+	if (hSomething == NULL) {
+		DISPATCH_INTERNAL_CRASH(GetLastError(), "CreateEventW");
+	}
+}
+
 void
 _dispatch_event_loop_poke(dispatch_wlh_t wlh DISPATCH_UNUSED,
 		uint64_t dq_state DISPATCH_UNUSED, uint32_t flags DISPATCH_UNUSED)
 {
-	WIN_PORT_ERROR();
+	static dispatch_once_t _something_pred;
+	dispatch_once_f(&_something_pred, NULL, _dispatch_something_init);
+	BOOL bResult = SetEvent(hSomething);
+	(void)dispatch_assume_zero(!bResult);
 }
 
 DISPATCH_NOINLINE
 void
-_dispatch_event_loop_drain(uint32_t flags DISPATCH_UNUSED)
+_dispatch_event_loop_drain(uint32_t flags)
+{
+	DWORD dwWait = WaitForSingleObject(hSomething,
+		(flags & KEVENT_FLAG_IMMEDIATE) ? 0 : INFINITE);
+	if (dwWait == WAIT_FAILED) {
+		DISPATCH_CLIENT_CRASH(GetLastError(), "WaitForSingleObject");
+	}
+
+	if (dwWait == WAIT_OBJECT_0) {
+		BOOL bResult = ResetEvent(hSomething);
+		if (!bResult) {
+			DISPATCH_INTERNAL_CRASH(GetLastError(), "ResetEvent");
+		}
+	}
+}
+
+void
+_dispatch_event_loop_cancel_waiter(dispatch_sync_context_t dsc DISPATCH_UNUSED)
 {
 	WIN_PORT_ERROR();
 }
@@ -109,9 +140,9 @@ _dispatch_event_loop_assert_not_owned(dispatch_wlh_t wlh)
 #endif
 
 void
-_dispatch_event_loop_leave_immediate(dispatch_wlh_t wlh, uint64_t dq_state)
+_dispatch_event_loop_leave_immediate(uint64_t dq_state)
 {
-	(void)wlh; (void)dq_state;
+	(void)dq_state;
 }
 
 #endif // DISPATCH_EVENT_BACKEND_WINDOWS

src/event/workqueue.c

@@ -97,7 +97,6 @@ _dispatch_workq_worker_register(dispatch_queue_global_t root_q)
 	_dispatch_unfair_lock_unlock(&mon->registered_tid_lock);
 #else
 	(void)root_q;
-	(void)cls;
 #endif // HAVE_DISPATCH_WORKQ_MONITORING
 }
 
@@ -124,7 +123,6 @@ _dispatch_workq_worker_unregister(dispatch_queue_global_t root_q)
 	_dispatch_unfair_lock_unlock(&mon->registered_tid_lock);
 #else
 	(void)root_q;
-	(void)cls;
 #endif // HAVE_DISPATCH_WORKQ_MONITORING
 }
 

src/init.c

@@ -739,7 +739,7 @@ DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_main, lane,
 	.dq_push        = _dispatch_main_queue_push,
 );
 
-#if DISPATCH_COCOA_COMPAT
+#if DISPATCH_COCOA_COMPAT || defined(_WIN32)
 DISPATCH_VTABLE_SUBCLASS_INSTANCE(queue_runloop, lane,
 	.do_type        = DISPATCH_QUEUE_RUNLOOP_TYPE,
 	.do_dispose     = _dispatch_runloop_queue_dispose,

src/inline_internal.h

@@ -1294,7 +1294,7 @@ _dispatch_queue_drain_try_lock_wlh(dispatch_queue_t dq, uint64_t *dq_state)
 	if (unlikely(!_dq_state_is_base_wlh(old_state) ||
 			!_dq_state_is_enqueued_on_target(old_state) ||
 			_dq_state_is_enqueued_on_manager(old_state))) {
-#if !__LP64__
+#if DISPATCH_SIZEOF_PTR == 4
 		old_state >>= 32;
 #endif
 		DISPATCH_INTERNAL_CRASH(old_state, "Invalid wlh state");

src/io.c

@@ -1399,11 +1399,11 @@ _dispatch_fd_entry_create_with_fd(dispatch_fd_t fd, uintptr_t hash)
 			int result = ioctlsocket((SOCKET)fd, (long)FIONBIO, &value);
 			(void)dispatch_assume_zero(result);
 			_dispatch_stream_init(fd_entry,
-				_dispatch_get_root_queue(DISPATCH_QOS_DEFAULT, false));
+				_dispatch_get_default_queue(false));
 		} else {
 			dispatch_suspend(fd_entry->barrier_queue);
-			dispatch_once_f(&_dispatch_io_devs_lockq_pred, NULL,
-					_dispatch_io_devs_lockq_init);
+			dispatch_once_f(&_dispatch_io_init_pred, NULL,
+					_dispatch_io_queues_init);
 			dispatch_async(_dispatch_io_devs_lockq, ^{
 				_dispatch_disk_init(fd_entry, 0);
 				dispatch_resume(fd_entry->barrier_queue);

src/object.c

@@ -203,7 +203,9 @@ _dispatch_xref_dispose(dispatch_object_t dou)
 		break;
 #endif
 	case DISPATCH_QUEUE_RUNLOOP_TYPE:
+#if DISPATCH_COCOA_COMPAT
 		_dispatch_runloop_queue_xref_dispose(dou._dl);
+#endif
 		break;
 	}
 	return _dispatch_release_tailcall(dou._os_obj);