diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-05-03 23:52:56 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-05-03 23:58:25 +0000 |
| commit | 3c1be0b2615e7bd6b8107f62f9ad625871397786 (patch) | |
| tree | d30eb27226b4f5c5ae9ffb762d54944202ba9d85 | |
| parent | abd872540f24cfc7dbd1ea29b6918c7082a22108 (diff) | |
| download | src-3c1be0b2615e7bd6b8107f62f9ad625871397786.tar.gz src-3c1be0b2615e7bd6b8107f62f9ad625871397786.zip | |
zfs: unbreak macOS bootstrap
Temporary patch until vendor implements a fix.
| -rw-r--r-- | sys/contrib/openzfs/lib/libspl/assert.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/lib/libspl/assert.c b/sys/contrib/openzfs/lib/libspl/assert.c index e6e3008f0aa6..5b12c14acd6e 100644 --- a/sys/contrib/openzfs/lib/libspl/assert.c +++ b/sys/contrib/openzfs/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); @@ -98,6 +100,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 @@ -128,7 +143,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); |