DNM/hacks to make 1121 build on Windows

Author: compnerd

src/event/event_windows.c

@@ -49,15 +49,17 @@ _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();
 }
@@ -109,9 +111,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/queue.c

@@ -571,7 +571,7 @@ dispatch_block_testcancel(dispatch_block_t db)
 	return (bool)(dbpd->dbpd_atomic_flags & DBF_CANCELED);
 }
 
-long
+intptr_t
 dispatch_block_wait(dispatch_block_t db, dispatch_time_t timeout)
 {
 	dispatch_block_private_data_t dbpd = _dispatch_block_get_data(db);

src/queue_internal.h

@@ -470,7 +470,9 @@ typedef struct dispatch_workloop_attr_s *dispatch_workloop_attr_t;
 typedef struct dispatch_workloop_attr_s {
 	uint32_t dwla_flags;
 	dispatch_priority_t dwla_pri;
+#if defined(_POSIX_THREADS)
 	struct sched_param dwla_sched;
+#endif
 	int dwla_policy;
 	struct {
 		uint8_t percent;
@@ -1045,7 +1047,9 @@ typedef struct dispatch_continuation_s {
 	DISPATCH_CONTINUATION_HEADER(continuation);
 } *dispatch_continuation_t;
 
+#if 0
 dispatch_assert_aliases(dispatch_continuation_s, dispatch_object_s, do_next);
+#endif
 dispatch_assert_aliases(dispatch_continuation_s, dispatch_object_s, do_vtable);
 
 typedef struct dispatch_sync_context_s {

src/shims/generic_sys_queue.h

@@ -89,4 +89,54 @@
 		} \
 	} while(0)
 
+#define TAILQ_HEAD_INITIALIZER(head) \
+  { NULL, (head).tq_first }
+
+#define TAILQ_CONCAT(head1, head2, field) \
+  do { \
+    if (!TAILQ_EMPTY(head2)) { \
+      (head1)->tq_last = (head2)->tq_first; \
+      (head2)->tq_first->field.te_prev = (head1)->tq_last; \
+      (head1)->tq_last = (head2)->tq_last; \
+      TAILQ_INIT((head2)); \
+    } \
+  } while (0)
+
+
+#define LIST_HEAD(name, type) \
+  struct name { \
+    struct type *lh_first; \
+  }
+
+#define LIST_ENTRY(type) \
+  struct { \
+    struct type *le_next; \
+    struct type**le_prev; \
+  }
+
+#define LIST_FIRST(head) ((head)->lh_first)
+
+#define LIST_FOREACH(var, head, field) \
+  for ((var) = LIST_FIRST((head)); \
+       (var); \
+       (var) = LIST_NEXT((var), field))
+
+#define LIST_NEXT(elm, field) ((elm)->field.le_next)
+
+#define LIST_REMOVE(elm, field) \
+  do { \
+    if (LIST_NEXT((elm), field) != NULL) \
+      LIST_NEXT((elm), field)->field.le_prev = (elm)->field.le_prev; \
+    TRASHIT(*oldnext); \
+    TRASHIT(*oldprev); \
+  } while (0)
+
+#define LIST_INSERT_HEAD(head, elm, field) \
+  do { \
+    if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL) \
+      LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field); \
+    LIST_FIRST((head)) = (elm); \
+    (elm)->field.le_prev = &LIST_FIRST((head)); \
+  } while (0)
+
 #endif // __DISPATCH_SHIMS_SYS_QUEUE__

src/shims/generic_win_stubs.h

@@ -34,4 +34,6 @@ typedef __typeof__(_Generic((__SIZE_TYPE__)0,                                  \
 #define WIN_PORT_ERROR() \
 		_RPTF1(_CRT_ASSERT, "WIN_PORT_ERROR in %s", __FUNCTION__)
 
+#define strcasecmp _stricmp
+
 #endif

src/shims/lock.c

@@ -509,7 +509,7 @@ _dispatch_wait_on_address(uint32_t volatile *_address, uint32_t value,
 	}
 	return _dispatch_futex_wait(address, value, NULL, FUTEX_PRIVATE_FLAG);
 #elif defined(_WIN32)
-	WaitOnAddress(address, (PVOID)(uintptr_t)value, sizeof(value), INFINITE);
+	return WaitOnAddress(address, (PVOID)(uintptr_t)value, sizeof(value), INFINITE) == TRUE;
 #else
 #error _dispatch_wait_on_address unimplemented for this platform
 #endif

src/shims/time.h

@@ -148,7 +148,7 @@ _dispatch_uptime(void)
 	struct timespec ts;
 	dispatch_assume_zero(clock_gettime(CLOCK_UPTIME, &ts));
 	return _dispatch_timespec_to_nano(ts);
-#elif TARGET_OS_WIN32
+#elif defined(_WIN32)
 	LARGE_INTEGER now;
 	return QueryPerformanceCounter(&now) ? now.QuadPart : 0;
 #else

src/shims/yield.h

@@ -149,8 +149,8 @@ void *_dispatch_wait_for_enqueuer(void **ptr);
 #define _dispatch_preemption_yield(n) { (void)n; pthread_yield_np(); }
 #define _dispatch_preemption_yield_to(th, n) { (void)n; pthread_yield_np(); }
 #elif defined(_WIN32)
-#define _dispatch_preemption_yield(n) { (void)n; sched_yield(); }
-#define _dispatch_preemption_yield_to(th, n) { (void)n; sched_yield(); }
+#define _dispatch_preemption_yield(n) { (void)n; Sleep(0); }
+#define _dispatch_preemption_yield_to(th, n) { (void)n; Sleep(0); }
 #else 
 #define _dispatch_preemption_yield(n) { (void)n; pthread_yield(); }
 #define _dispatch_preemption_yield_to(th, n) { (void)n; pthread_yield(); }

src/source.c

@@ -197,7 +197,7 @@ dispatch_source_get_extended_data(dispatch_source_t ds,
 }
 
 void
-dispatch_source_merge_data(dispatch_source_t ds, unsigned long val)
+dispatch_source_merge_data(dispatch_source_t ds, uintptr_t val)
 {
 	dispatch_queue_flags_t dqf = _dispatch_queue_atomic_flags(ds);
 	dispatch_source_refs_t dr = ds->ds_refs;