devel/libdispatch: bring back Grand Central Dispatch API support libr…

…ary (+)
freebsd · Nov 8, 2022 · b966231 · b966231
1 parent 1ac270f
commit b966231
Show file tree

Hide file tree

Showing 26 changed files with 1,016 additions and 1 deletion.
diff --git a/MOVED b/MOVED
@@ -14507,7 +14507,6 @@ devel/hs-bytestring-nums||2020-05-05|Has expired: No releases since 2012
 devel/iz||2020-05-05|Has expired: Broken for more than 6 months
 devel/jfrog-cli||2020-05-05|Has expired: Broken for more than 6 months
 devel/libcfg||2020-05-05|Has expired: Broken for more than 6 months
-devel/libdispatch||2020-05-05|Has expired: Broken for more than 6 months
 devel/libjson++||2020-05-05|Has expired: Broken for more than 6 months
 devel/libmonetra||2020-05-05|Has expired: Broken for more than 6 months
 devel/libol||2020-05-05|Has expired: Broken for more than 6 months

diff --git a/devel/Makefile b/devel/Makefile
@@ -1149,6 +1149,7 @@
     SUBDIR += libdatrie
     SUBDIR += libdbusmenu
     SUBDIR += libdbusmenu-qt
+    SUBDIR += libdispatch
     SUBDIR += libddoc
     SUBDIR += libdevq
     SUBDIR += libdfui

diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	libdispatch
+DISTVERSION=	5.5
+CATEGORIES=	devel
+
+MAINTAINER=	fluffy@FreeBSD.org
+COMMENT=	Grand Central Dispatch API support library
+
+LICENSE=	APACHE20
+
+USES=		cmake compiler:c++17-lang
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	apple
+GH_PROJECT=	swift-corelibs-libdispatch
+GH_TAGNAME=	swift-${DISTVERSION}-RELEASE
+
+.include <bsd.port.mk>
diff --git a/devel/libdispatch/distinfo b/devel/libdispatch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1667817651
+SHA256 (apple-swift-corelibs-libdispatch-5.5-swift-5.5-RELEASE_GH0.tar.gz) = 5efdfa1d2897c598acea42fc00776477bb3713645686774f5ff0818b26649e62
+SIZE (apple-swift-corelibs-libdispatch-5.5-swift-5.5-RELEASE_GH0.tar.gz) = 592054
diff --git a/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake b/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake
@@ -0,0 +1,10 @@
+--- cmake/modules/DispatchCompilerWarnings.cmake.orig	2021-09-17 04:54:52 UTC
++++ cmake/modules/DispatchCompilerWarnings.cmake
+@@ -2,7 +2,6 @@ else()
+ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+   # TODO: someone needs to provide the msvc equivalent warning flags
+ else()
+-  add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+
diff --git a/devel/libdispatch/files/patch-cmake_modules_SwiftSupport.cmake b/devel/libdispatch/files/patch-cmake_modules_SwiftSupport.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/SwiftSupport.cmake.orig	2021-09-17 04:54:52 UTC
++++ cmake/modules/SwiftSupport.cmake
+@@ -23,6 +23,8 @@ function(get_swift_host_arch result_var_name)
+     set("${result_var_name}" "armv7" PARENT_SCOPE)
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+     set("${result_var_name}" "armv7" PARENT_SCOPE)
++  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
++    set("${result_var_name}" "amd64" PARENT_SCOPE)
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+     set("${result_var_name}" "x86_64" PARENT_SCOPE)
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
diff --git a/devel/libdispatch/files/patch-private_private.h b/devel/libdispatch/files/patch-private_private.h
@@ -0,0 +1,20 @@
+--- private/private.h.orig	2021-09-17 04:54:52 UTC
++++ private/private.h
+@@ -177,7 +177,7 @@ void _dispatch_prohibit_transition_to_multithreaded(bo
+
+ #if TARGET_OS_MAC
+ #define DISPATCH_COCOA_COMPAT 1
+-#elif defined(__linux__) || defined(__FreeBSD__) || defined(_WIN32)
++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_WIN32)
+ #define DISPATCH_COCOA_COMPAT 1
+ #else
+ #define DISPATCH_COCOA_COMPAT 0
+@@ -191,6 +191,8 @@ typedef int dispatch_runloop_handle_t;
+ typedef mach_port_t dispatch_runloop_handle_t;
+ #elif defined(__linux__) || defined(__FreeBSD__)
+ typedef int dispatch_runloop_handle_t;
++#elif defined(__unix__)
++typedef uint64_t dispatch_runloop_handle_t;
+ #elif defined(_WIN32)
+ typedef void *dispatch_runloop_handle_t;
+ #else
diff --git a/devel/libdispatch/files/patch-src_CMakeLists.txt b/devel/libdispatch/files/patch-src_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2021-09-17 04:54:52 UTC
++++ src/CMakeLists.txt
+@@ -127,7 +127,7 @@ target_compile_options(dispatch PRIVATE -fblocks)
+ # FIXME(compnerd) add check for -fblocks?
+ target_compile_options(dispatch PRIVATE -fblocks)
+
+-check_c_compiler_flag("-momit-leaf-frame-pointer -Werror -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
++check_c_compiler_flag("-momit-leaf-frame-pointer -Wall" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+ if (C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+   target_compile_options(dispatch PRIVATE -momit-leaf-frame-pointer)
+ endif()
diff --git a/devel/libdispatch/files/patch-src_event_event.c b/devel/libdispatch/files/patch-src_event_event.c
@@ -0,0 +1,23 @@
+--- src/event/event.c.orig	2021-09-17 04:54:52 UTC
++++ src/event/event.c
+@@ -766,9 +766,9 @@ _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%llx }", \
+ 				_dispatch_wref2ptr((du)->du_owner_wref), what, \
+-				(du), (du)->du_ident)
++				(du), (unsigned long long)(du)->du_ident)
+
+ DISPATCH_ALWAYS_INLINE
+ static inline unsigned int
+@@ -792,7 +792,7 @@ _dispatch_timer_unote_disarm(dispatch_timer_source_ref
+ _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);
diff --git a/devel/libdispatch/files/patch-src_event_event__internal.h b/devel/libdispatch/files/patch-src_event_event__internal.h
@@ -0,0 +1,11 @@
+--- src/event/event_internal.h.orig	2021-09-17 04:54:52 UTC
++++ src/event/event_internal.h
+@@ -125,6 +125,8 @@ typedef uintptr_t dispatch_unote_ident_t;
+
+ #if defined(_WIN32)
+ typedef uintptr_t dispatch_unote_ident_t;
++#elif defined(__FreeBSD__)
++typedef uintptr_t dispatch_unote_ident_t;
+ #else
+ typedef uint32_t dispatch_unote_ident_t;
+ #endif
diff --git a/devel/libdispatch/files/patch-src_event_event__kevent.c b/devel/libdispatch/files/patch-src_event_event__kevent.c
@@ -0,0 +1,259 @@
+--- src/event/event_kevent.c.orig	2021-09-17 04:54:52 UTC
++++ src/event/event_kevent.c
+@@ -101,8 +101,12 @@ _evfiltstr(short filt)
+ 	_evfilt2(EVFILT_MACHPORT);
+ 	_evfilt2(DISPATCH_EVFILT_MACH_NOTIFICATION);
+ #endif
++#ifdef EVFILT_FS
+ 	_evfilt2(EVFILT_FS);
++#endif
++#ifdef EVFILT_USER
+ 	_evfilt2(EVFILT_USER);
++#endif
+ #ifdef EVFILT_SOCK
+ 	_evfilt2(EVFILT_SOCK);
+ #endif
+@@ -236,9 +240,9 @@ dispatch_kevent_debug(const char *verb, const dispatch
+
+ #define _dispatch_du_debug(what, du) \
+ 		_dispatch_debug("kevent-source[%p]: %s kevent[%p] " \
+-				"{ filter = %s, ident = 0x%x }", \
++				"{ filter = %s, ident = 0x%llx }", \
+ 				_dispatch_wref2ptr((du)->du_owner_wref), what, \
+-				(du), _evfiltstr((du)->du_filter), (du)->du_ident)
++				(du), _evfiltstr((du)->du_filter), (unsigned long long)(du)->du_ident)
+
+ #if DISPATCH_MACHPORT_DEBUG
+ #ifndef MACH_PORT_TYPE_SPREQUEST
+@@ -388,8 +392,10 @@ _dispatch_kevent_print_error(dispatch_kevent_t ke)
+ 	switch (ke->data) {
+ 	case 0:
+ 		return;
++#if DISPATCH_USE_KEVENT_QOS
+ 	case ERANGE: /* A broken QoS was passed to kevent_id() */
+ 		DISPATCH_INTERNAL_CRASH(ke->qos, "Invalid kevent priority");
++#endif
+ 	default:
+ 		// log the unexpected error
+ 		_dispatch_bug_kevent_client("kevent", _evfiltstr(ke->filter),
+@@ -397,7 +403,7 @@ _dispatch_kevent_print_error(dispatch_kevent_t ke)
+ 				ke->flags & EV_DELETE ? "delete" :
+ 				ke->flags & EV_ADD ? "add" :
+ 				ke->flags & EV_ENABLE ? "enable" : "monitor",
+-				(int)ke->data, ke->ident, ke->udata, du);
++				(int)ke->data, ke->ident, (uint64_t)ke->udata, du);
+ 	}
+ }
+
+@@ -528,11 +534,17 @@ _dispatch_kevent_merge_muxed(dispatch_kevent_t ke)
+ 	}
+ }
+
++#define DISPATCH_KEVENT_ERSATZ_EVFILT_USER_MASK 0xfffffe00
++
+ DISPATCH_NOINLINE
+ static void
+ _dispatch_kevent_drain(dispatch_kevent_t ke)
+ {
++#ifdef EVFILT_USER
+ 	if (ke->filter == EVFILT_USER) {
++#else
++	if (ke->filter == EVFILT_TIMER && ke->ident == DISPATCH_KEVENT_ERSATZ_EVFILT_USER_MASK) {
++#endif
+ 		_dispatch_kevent_mgr_debug("received", ke);
+ 		return;
+ 	}
+@@ -579,10 +591,17 @@ _dispatch_kq_create(intptr_t *fd_ptr)
+ _dispatch_kq_create(intptr_t *fd_ptr)
+ {
+ 	static const dispatch_kevent_s kev = {
++#ifdef EVFILT_USER
+ 		.ident = 1,
+ 		.filter = EVFILT_USER,
+ 		.flags = EV_ADD|EV_CLEAR,
+ 		.udata = (dispatch_kevent_udata_t)DISPATCH_WLH_MANAGER,
++#else
++		.ident = DISPATCH_KEVENT_ERSATZ_EVFILT_USER_MASK,
++		.filter = EVFILT_TIMER,
++		.flags = EV_ADD|EV_DISABLE,
++		.data = 1,
++#endif
+ 	};
+ 	int kqfd;
+
+@@ -591,7 +610,6 @@ _dispatch_kq_create(intptr_t *fd_ptr)
+ 	guardid_t guard = (uintptr_t)fd_ptr;
+ 	kqfd = guarded_kqueue_np(&guard, GUARD_CLOSE | GUARD_DUP);
+ #else
+-	(void)guard_ptr;
+ 	kqfd = kqueue();
+ #endif
+ 	if (kqfd == -1) {
+@@ -727,6 +745,10 @@ retry:
+ 		(void)avail;
+ 		const struct timespec timeout_immediately = {}, *timeout = NULL;
+ 		if (flags & KEVENT_FLAG_IMMEDIATE) timeout = &timeout_immediately;
++#ifdef EVFILT_USER
++		const struct timespec timeout_1ms = {.tv_sec = 0, .tv_nsec = 1000000};
++		if (ke->ident == DISPATCH_KEVENT_ERSATZ_EVFILT_USER_MASK) timeout = &timeout_1ms;
++#endif
+ 		r = kevent(kqfd, ke, n, ke_out, n_out, timeout);
+ #endif
+ #if DISPATCH_USE_KEVENT_WORKLOOP
+@@ -743,7 +765,7 @@ retry:
+ 		switch (err) {
+ 		case ENOMEM:
+ 			_dispatch_temporary_resource_shortage();
+-			/* FALLTHROUGH */
++			DISPATCH_FALLTHROUGH;
+ 		case EINTR:
+ 			goto retry;
+ 		case EBADF:
+@@ -754,7 +776,7 @@ retry:
+ 					(flags & KEVENT_FLAG_DYNAMIC_KQ_MUST_EXIST)) {
+ 				return 0;
+ 			}
+-			/* FALLTHROUGH */
++			DISPATCH_FALLTHROUGH;
+ #endif // DISPATCH_USE_KEVENT_WORKLOOP
+ 		default:
+ 			DISPATCH_CLIENT_CRASH(err, "Unexpected error from kevent");
+@@ -786,9 +808,15 @@ _dispatch_kq_drain(dispatch_wlh_t wlh, dispatch_kevent
+
+ #if DISPATCH_DEBUG
+ 	for (r = 0; r < n; r++) {
++#ifdef EVFILT_USER
+ 		if (ke[r].filter != EVFILT_USER || DISPATCH_MGR_QUEUE_DEBUG) {
+ 			_dispatch_kevent_debug_n(NULL, ke + r, r, n);
+ 		}
++#else
++		if (DISPATCH_MGR_QUEUE_DEBUG) {
++			_dispatch_kevent_debug_n(NULL, ke + r, r, n);
++		}
++#endif
+ 	}
+ #endif
+
+@@ -860,7 +888,6 @@ _dispatch_kq_unote_set_kevent(dispatch_unote_t _du, di
+ 				du->du_priority),
+ #endif
+ 	};
+-	(void)pp; // if DISPATCH_USE_KEVENT_QOS == 0
+ }
+
+ DISPATCH_ALWAYS_INLINE
+@@ -921,9 +948,13 @@ _dispatch_kq_deferred_update(dispatch_wlh_t wlh, dispa
+ 				ke->udata);
+ 		dispatch_kevent_t dk = _dispatch_kq_deferred_reuse_slot(wlh, ddi, slot);
+ 		*dk = *ke;
++#ifdef EVFILT_USER
+ 		if (ke->filter != EVFILT_USER) {
+ 			_dispatch_kevent_mgr_debug("deferred", ke);
+ 		}
++#else
++		_dispatch_kevent_mgr_debug("deferred", ke);
++#endif
+ 	} else {
+ 		_dispatch_kq_update_one(wlh, ke);
+ 	}
+@@ -985,6 +1016,7 @@ _dispatch_sync_ipc_handoff_end(dispatch_wlh_t wlh, mac
+ }
+ #endif
+
++#if DISPATCH_HAVE_DIRECT_KNOTES
+ DISPATCH_NOINLINE
+ static bool
+ _dispatch_kq_unote_update(dispatch_wlh_t wlh, dispatch_unote_t _du,
+@@ -1055,6 +1087,7 @@ done:
+ 	dispatch_assume_zero(r);
+ 	return true;
+ }
++#endif
+
+ #pragma mark dispatch_muxnote_t
+
+@@ -1283,6 +1316,7 @@ _dispatch_unote_unregister_direct(dispatch_unote_t du,
+ #pragma mark -
+ #pragma mark dispatch_event_loop
+
++#if DISPATCH_USE_KEVENT_WORKLOOP
+ enum {
+ 	DISPATCH_WORKLOOP_ASYNC,
+ 	DISPATCH_WORKLOOP_ASYNC_FROM_SYNC,
+@@ -1316,6 +1350,7 @@ static char const * const _dispatch_workloop_actions[]
+ 	[DISPATCH_WORKLOOP_SYNC_WAKE]                   = "sync-wake",
+ 	[DISPATCH_WORKLOOP_SYNC_END]                    = "sync-end",
+ };
++#endif
+
+ void
+ _dispatch_event_loop_atfork_child(void)
+@@ -1410,7 +1445,7 @@ _dispatch_kq_fill_workloop_event(dispatch_kevent_t ke,
+ 	switch (which) {
+ 	case DISPATCH_WORKLOOP_ASYNC_FROM_SYNC:
+ 		fflags |= NOTE_WL_END_OWNERSHIP;
+-		/* FALLTHROUGH */
++		DISPATCH_FALLTHROUGH;
+ 	case DISPATCH_WORKLOOP_ASYNC:
+ 	case DISPATCH_WORKLOOP_ASYNC_DISCOVER_SYNC:
+ 	case DISPATCH_WORKLOOP_ASYNC_QOS_UPDATE:
+@@ -1434,10 +1469,10 @@ _dispatch_kq_fill_workloop_event(dispatch_kevent_t ke,
+
+ 	case DISPATCH_WORKLOOP_ASYNC_LEAVE_FROM_SYNC:
+ 		fflags |= NOTE_WL_END_OWNERSHIP;
+-		/* FALLTHROUGH */
++		DISPATCH_FALLTHROUGH;
+ 	case DISPATCH_WORKLOOP_ASYNC_LEAVE_FROM_TRANSFER:
+ 		fflags |= NOTE_WL_IGNORE_ESTALE;
+-		/* FALLTHROUGH */
++		DISPATCH_FALLTHROUGH;
+ 	case DISPATCH_WORKLOOP_ASYNC_LEAVE:
+ 		dispatch_assert(!_dq_state_is_enqueued_on_target(dq_state));
+ 		action = EV_ADD | EV_DELETE | EV_ENABLE;
+@@ -1881,10 +1916,17 @@ _dispatch_event_loop_poke(dispatch_wlh_t wlh, uint64_t
+ {
+ 	if (wlh == DISPATCH_WLH_MANAGER) {
+ 		dispatch_kevent_s ke = (dispatch_kevent_s){
++#ifdef EVFILT_USER
+ 			.ident  = 1,
+ 			.filter = EVFILT_USER,
+ 			.fflags = NOTE_TRIGGER,
+ 			.udata = (dispatch_kevent_udata_t)DISPATCH_WLH_MANAGER,
++#else
++			.ident = DISPATCH_KEVENT_ERSATZ_EVFILT_USER_MASK,
++			.filter = EVFILT_TIMER,
++			.flags = EV_ADD|EV_ENABLE,
++			.data = 1
++#endif
+ 		};
+ 		return _dispatch_kq_deferred_update(DISPATCH_WLH_ANON, &ke);
+ 	} else if (wlh && wlh != DISPATCH_WLH_ANON) {
+@@ -2357,6 +2399,12 @@ _dispatch_event_loop_timer_arm(dispatch_timer_heap_t d
+ 		target += range.leeway;
+ 		range.leeway = 0;
+ 	}
++#if !NOTE_ABSOLUTE
++	target = range.delay;
++#if defined(__FreeBSD__)
++	target /= 1000000;
++#endif
++#endif
+
+ 	_dispatch_event_loop_timer_program(dth, tidx, target, range.leeway,
+ 			EV_ADD | EV_ENABLE);
+@@ -2445,6 +2493,7 @@ const dispatch_source_type_s _dispatch_source_type_vno
+ 	.dst_merge_evt  = _dispatch_source_merge_evt,
+ };
+
++#ifdef EVFILT_FS
+ const dispatch_source_type_s _dispatch_source_type_vfs = {
+ 	.dst_kind       = "vfs",
+ 	.dst_filter     = EVFILT_FS,
+@@ -2477,6 +2526,7 @@ const dispatch_source_type_s _dispatch_source_type_vfs
+ 	.dst_create     = _dispatch_unote_create_without_handle,
+ 	.dst_merge_evt  = _dispatch_source_merge_evt,
+ };
++#endif
+
+ #ifdef EVFILT_SOCK
+ const dispatch_source_type_s _dispatch_source_type_sock = {