From nobody Sat May 4 00:10:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VWSkG2nWvz5JpTx; Sat, 4 May 2024 00:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VWSkG16yvz4qFH; Sat, 4 May 2024 00:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714781446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWZ8P75Pb6t6EJped0r7eYm3/8PTm4ErJIjTYZevg7s=; b=uQC9TiX8/IhY9IuYZNHnB4Xl1WgWeHXx4ovy4iRZj/cPW/q7XeBC1yaFTmDfFhu98ntCB5 d5EuXMwgTlKaAKWAxON7mIbFTkGWSigVRtGWpvXnBCbkNtOdrrlCuLlfl9OponNnh7tXY9 +SVrnDgURoAqvYVgiuxgBXRTib5sbF6o4KRSIHUYdH3o3nrHXZCgBhQjLfplpUoy7ZSCl+ 63EF9bcRcOjZ+0fAbhLovDMyYyE/B5Jx9MTUFx3mWKq28I+4Lb8jEAVn1YzP2kZCYasOFw DtTiLxYXQslUCmc4ruUse21qYZBLLnACDPVMuKW1FCTnn4ENpRqBNw/qi2znvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714781446; a=rsa-sha256; cv=none; b=ZlK6PcswppuMtiyVk8TmANTD5MtOqBWCd4ov2aTzlRoziOxfQ+KASUcnUlMC9FILZl5ASu lxCJrOzsmdIrhiMUzt3I0dTKJzwoz+ySh0onoqEexvA09TElW2Af4BPv7FAwixQy5FNID+ 0wtp8dMHQixN7ew5YV7KikrMA0gujVSDyQBL7bSExAUlS6/XwJPy1Oa5835PalAlddbOmZ wgzeu4Tw7VT3h0COzo+W+6vmskrhKPB7OH7Ae7QaVwPynK+XO7r0SCqtpVGF3Y3nGqBbqs 9EsKw3vEpIJXZLgrAkqz39mq/WTbG/p1xnC6z2XM6NbOwx6B3soFdRBWWQ+1dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714781446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWZ8P75Pb6t6EJped0r7eYm3/8PTm4ErJIjTYZevg7s=; b=b2yroXmXFDH2WQw7GdWIr8LqG+APjqDuNKrtivLxT1SkCrz5yKC07qWWlfA4YFPJDaI+4D tpnHpTbWHzgg9Te2cNmkvHulh1zxH88YJ9QNB81wBzr6pO9ye2IYRm7FXYwAtfhJgNoWZi VtjO9y4beWjLdbKXtcYPvrHybBe5Y+yGyDuS9Cdngi6oFPiyWMlxDuNWJotvYi3HDEIMzW SMsPxHRP25bW+aVgNXMorw0+VgIKlRxAj3eka7gfEEnpD9dd2WxUBbAp0cQKCTppmfsnQ2 Rj8cDHRyeB5e20JXMyAHsYkmW/i/+vqgMH9OzkUEf+qq8HwpFRfnvdV0mdt0hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VWSkG0k3hz16Wb; Sat, 4 May 2024 00:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4440Ajcw012412; Sat, 4 May 2024 00:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4440AjfY012409; Sat, 4 May 2024 00:10:45 GMT (envelope-from git) Date: Sat, 4 May 2024 00:10:45 GMT Message-Id: <202405040010.4440AjfY012409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 3c1be0b2615e - main - zfs: unbreak macOS bootstrap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c1be0b2615e7bd6b8107f62f9ad625871397786 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1be0b2615e7bd6b8107f62f9ad625871397786 commit 3c1be0b2615e7bd6b8107f62f9ad625871397786 Author: Martin Matuska AuthorDate: 2024-05-03 23:52:56 +0000 Commit: Martin Matuska CommitDate: 2024-05-03 23:58:25 +0000 zfs: unbreak macOS bootstrap Temporary patch until vendor implements a fix. --- sys/contrib/openzfs/lib/libspl/assert.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 #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);