Unbreak FreeBSD cross-build on MacOS broken in 051460b

MacOS used FreeBSD-compatible getprogname() and pthread_getname_np(). But pthread_getthreadid_np() does not exist on MacOS. This implements libspl_gettid() using pthread_threadid_np() to get the thread id of the current thread. Tested with FreeBSD GitHub actions freebsd-src/.github/workflows/cross-bootstrap-tools.yml Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Rob Norris <[email protected]> Signed-off-by: Martin Matuska <[email protected]> Closes openzfs#16167
openzfsonwindows · Sep 4, 2024 · 5317fd2 · 5317fd2
1 parent 1c920aa
commit 5317fd2
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/lib/libspl/assert.c b/lib/libspl/assert.c
@@ -41,9 +41,11 @@
 #define	libspl_getprogname()	(program_invocation_short_name)
 #define	libspl_getthreadname(buf, len)	\
 	prctl(PR_GET_NAME, (unsigned long)(buf), 0, 0, 0)
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__APPLE__)
+#if !defined(__APPLE__)
 #include <pthread_np.h>
 #define	libspl_gettid()		pthread_getthreadid_np()
+#endif
 #define	libspl_getprogname()	getprogname()
 #define	libspl_getthreadname(buf, len)	\
 	pthread_getname_np(pthread_self(), buf, len);
@@ -103,6 +105,19 @@ libspl_dump_backtrace(void)
 #define	libspl_dump_backtrace()
 #endif
 
+#if defined(__APPLE__)
+static inline uint64_t
+libspl_gettid(void)
+{
+	uint64_t tid;
+
+	if (pthread_threadid_np(NULL, &tid) != 0)
+		tid = 0;
+
+	return (tid);
+}
+#endif
+
 static boolean_t libspl_assert_ok = B_FALSE;
 
 void
@@ -133,7 +148,11 @@ libspl_assertf(const char *file, const char *func, int line,
 
 	fprintf(stderr, "\n"
 	    "  PID: %-8u  COMM: %s\n"
+#if defined(__APPLE__)
+	    "  TID: %-8" PRIu64 "  NAME: %s\n",
+#else
 	    "  TID: %-8u  NAME: %s\n",
+#endif
 	    getpid(), libspl_getprogname(),
 	    libspl_gettid(), tname);