Handle dispatch_unote_ident_t typedefs properly.

Different platforms need to typedef dispatch_unote_ident differently,
and subsequently may have different bit widths and proper handling
thereof. Mostly this involves debug printing, which needs proper format
handling.

One special case for consideration is `_dispatch_timer_unote_disarm`;
this gets the `du_ident` and converts that into a `uint32_t` timer
index. When `dispatch_unote_ident` is a `uint32_t` this is of course
fine, but needs consideration for when it isn't. Here, we just cast
down. This is somewhat reasonable since this is initialized from
`_dispatch_timer_unote_idx` which returns an `unsigned int`. (Of course,
we are not actually bounds checking that index, but that's outside the
scope of this commit).

Author: 3405691582

src/event/event.c

@@ -766,7 +766,7 @@ _dispatch_timer_heap_update(dispatch_timer_heap_t dth,
 #pragma mark timer unote
 
 #define _dispatch_timer_du_debug(what, du) \
-		_dispatch_debug("kevent-source[%p]: %s kevent[%p] { ident = 0x%x }", \
+		_dispatch_debug("kevent-source[%p]: %s kevent[%p] { ident = 0x%" PRI_DUI " }", \
 				_dispatch_wref2ptr((du)->du_owner_wref), what, \
 				(du), (du)->du_ident)
 
@@ -792,7 +792,7 @@ static void
 _dispatch_timer_unote_disarm(dispatch_timer_source_refs_t dt,
 		dispatch_timer_heap_t dth)
 {
-	uint32_t tidx = dt->du_ident;
+	uint32_t tidx = (uint32_t)dt->du_ident;
 
 	dispatch_assert(_dispatch_unote_armed(dt));
 	_dispatch_timer_heap_remove(&dth[tidx], dt);

src/event/event_internal.h

@@ -125,8 +125,13 @@ _dispatch_timer_flags_from_clock(dispatch_clock_t clock)
 
 #if defined(_WIN32)
 typedef uintptr_t dispatch_unote_ident_t;
+#define PRI_DUI PRIuPTR
+#elif defined(__OpenBSD__)
+typedef uintptr_t dispatch_unote_ident_t;
+#define PRI_DUI PRIuPTR
 #else
 typedef uint32_t dispatch_unote_ident_t;
+#define PRI_DUI PRIu32
 #endif
 
 #define DISPATCH_UNOTE_CLASS_HEADER() \

src/event/event_kevent.c

@@ -195,7 +195,7 @@ dispatch_kevent_debug(const char *verb, const dispatch_kevent_s *kev,
 		}
 	}
 #if DISPATCH_USE_KEVENT_QOS
-	_dispatch_debug("%s kevent[%p] %s= { ident = 0x%llx, filter = %s, "
+	_dispatch_debug("%s kevent[%p] %s= { ident = 0x%" PRI_DUI ", filter = %s, "
 			"flags = %s (0x%x), fflags = 0x%x, data = 0x%llx, udata = 0x%llx, "
 			"qos = 0x%x, ext[0] = 0x%llx, ext[1] = 0x%llx, ext[2] = 0x%llx, "
 			"ext[3] = 0x%llx }: %s #%u", verb, kev, i_n,
@@ -205,7 +205,7 @@ dispatch_kevent_debug(const char *verb, const dispatch_kevent_s *kev,
 			kev->ext[0], kev->ext[1], kev->ext[2], kev->ext[3],
 			function, line);
 #else
-	_dispatch_debug("%s kevent[%p] %s= { ident = 0x%llx, filter = %s, "
+	_dispatch_debug("%s kevent[%p] %s= { ident = 0x%" PRI_DUI ", filter = %s, "
 			"flags = %s (0x%x), fflags = 0x%x, data = 0x%llx, udata = 0x%llx}: "
 			"%s #%u", verb, kev, i_n,
 			(unsigned long long)kev->ident, _evfiltstr(kev->filter),
@@ -240,7 +240,7 @@ dispatch_kevent_debug(const char *verb, const dispatch_kevent_s *kev,
 
 #define _dispatch_du_debug(what, du) \
 		_dispatch_debug("kevent-source[%p]: %s kevent[%p] " \
-				"{ filter = %s, ident = 0x%x }", \
+				"{ filter = %s, ident = 0x%" PRI_DUI " }", \
 				_dispatch_wref2ptr((du)->du_owner_wref), what, \
 				(du), _evfiltstr((du)->du_filter), (du)->du_ident)
 

src/init.c

@@ -1043,10 +1043,10 @@ _dispatch_bug_kevent_vanished(dispatch_unote_t du)
 	_dispatch_log_fault("LIBDISPATCH_STRICT: _dispatch_bug_kevent_vanished",
 			"BUG in libdispatch client: %s, monitored resource vanished before "
 			"the source cancel handler was invoked "
-			"{ %p[%s], ident: %" PRIdPTR " / 0x%" PRIxPTR ", handler: %p }",
+			"{ %p[%s], ident: %" PRI_DUI " / 0x%" PRIxMAX ", handler: %p }",
 			dux_type(du._du)->dst_kind, dou._dq,
 			dou._dq->dq_label ? dou._dq->dq_label : "<unknown>",
-			du._du->du_ident, du._du->du_ident, func);
+			du._du->du_ident, (uintmax_t)du._du->du_ident, func);
 }
 
 #endif // RDAR_49023449
@@ -1151,8 +1151,8 @@ _dispatch_logv_init(void *context DISPATCH_UNUSED)
 			}
 #else
 			dprintf(dispatch_logfile, "=== log file opened for %s[%u] at "
-					"%ld.%06u ===\n", getprogname() ?: "", getpid(),
-					tv.tv_sec, (int)tv.tv_usec);
+					"%lld.%06u ===\n", getprogname() ?: "", getpid(),
+					(time_t)tv.tv_sec, (int)tv.tv_usec);
 #endif
 		}
 	}

src/source.c

@@ -1398,7 +1398,7 @@ _dispatch_source_debug_attr(dispatch_source_t ds, char* buf, size_t bufsiz)
 	dispatch_source_refs_t dr = ds->ds_refs;
 	dispatch_queue_flags_t dqf = _dispatch_queue_atomic_flags(ds);
 	dispatch_unote_state_t du_state = _dispatch_unote_state(dr);
-	return dsnprintf(buf, bufsiz, "target = %s[%p], ident = 0x%x, "
+	return dsnprintf(buf, bufsiz, "target = %s[%p], ident = 0x%" PRI_DUI ", "
 			"mask = 0x%x, pending_data = 0x%llx, registered = %d, "
 			"armed = %d, %s%s%s",
 			target && target->dq_label ? target->dq_label : "", target,