From nobody Sat Jan 4 03:57:46 2025 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 4YQ6963gVkz5j98T; Sat, 04 Jan 2025 03:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQ6961FyRz4qTw; Sat, 4 Jan 2025 03:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963066; 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=JOUACFaxv+HS87IhMLkVgGdmOsRVOOqX9BrvAC6TkN0=; b=gJYzOFIYzph228XjBV7r3c2EsgvcGfFwXw2/Q9vr5TmliCbQ7i3z+8arzWZFmAFYKH2YPp 0eRgfAs+fOwYyb07yxgd9pJHDcH9R8BD7hibGoTatAD2RrjBy5AQMIF4c1pmPwljAhkwI3 wMZLvxucLzgMisxb3cJurKGsRxCjd2xF1G/EHxG2d02qA8VKvFb1tS2l8ir3OfvujoG/zO gdMhBRz/s6dP7ZUq+qJOP3MspnczlYG0BqHYmtE6Hf8ubrUTOX2h9F5VQqt0IoO0lS/x6N aqmmM6ZDv3NgPzmIXqzTxzA9eYg9lb7wiHUecMBanRD41xwEMXBayCllnbIsmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963066; 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=JOUACFaxv+HS87IhMLkVgGdmOsRVOOqX9BrvAC6TkN0=; b=kK+FNTGdCyiBuJzh5YAQU/RFUr+uGz+dy1HMMXKTXHE3g2zvkBWCzAxjMAvTuuCALXL5DD CT3buu5YrTTo82iAHC+hhRRcZxSfhJRQComsb/NOofoRJTrrHRgmcpydRYbtALrEK7u48v oy/bDyR07tD3KnBnjuhSE7L7QZEDmeEBbDKy69cxXkOesr4fIk5W59lKJw82msoDIE5giE LEOHSqWU5Avcf+iPcWJELNLCwBX6j+Ro2/bcrbElgWa/+RJlV2476r359AN1E/qJdZL0+i 2q4Q4A1KhxmlDNEGDNm2E2xdLegqQDdZ7BEPVO1xL1gA5glx3ezuuz8j8K+m1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963066; a=rsa-sha256; cv=none; b=mu0+gpXuauWEqtqw5T4OgEYzYUHyavZm4CqSiA4Axm2bAN1ueqO8KTMHoHEXAJ1ReJYgaY iGV2GwIZoBShik2tH0Ygvw7Y96CiJBd4UdqDiWjAR0gS3eLPCh/piVroQoppEp5bz45u7g lZVtkgMqgjrSfrzj/YHmdxytKhJ2KWbzjeafQ2xIZpgRkUwmo5N/4LB+BNrbCbC485BlG0 0EBzZDPwLtdJYfGtzsrwR7uXEOyXcoCpBNacYamA8aVReiFxMhecvkc7KYOGZ77oihQnNJ 2DGxv/98WM4ky7twmN1sFrNwVLmfyptZ8VVNlkFzPlgFjkt2isyGwKTX20C6yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQ6960nt7zckD; Sat, 04 Jan 2025 03:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5043vkP0028283; Sat, 4 Jan 2025 03:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vk4H028279; Sat, 4 Jan 2025 03:57:46 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:46 GMT Message-Id: <202501040357.5043vk4H028279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 60b5e18c5362 - stable/14 - libthr: move dlerror_msg into zeroed part of struct thread 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60b5e18c5362541323dd214119a1b0664485ae06 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=60b5e18c5362541323dd214119a1b0664485ae06 commit 60b5e18c5362541323dd214119a1b0664485ae06 Author: Konstantin Belousov AuthorDate: 2024-12-23 23:48:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 libthr: move dlerror_msg into zeroed part of struct thread (cherry picked from commit 86f6ff9ff00e2ba4d4cd5b7a94d57b1c3f85ff98) --- lib/libthr/thread/thr_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 7b8a2d6569f9..b34c084ad04d 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -562,8 +562,12 @@ struct pthread { /* Deferred threads from pthread_cond_signal. */ unsigned int *defer_waiters[MAX_DEFER_WAITERS]; -#define _pthread_endzero wake_addr + /* rtld thread-local dlerror message and seen control */ + char dlerror_msg[512]; + int dlerror_seen; + +#define _pthread_endzero wake_addr struct wake_addr *wake_addr; #define WAKE_ADDR(td) ((td)->wake_addr) @@ -572,10 +576,6 @@ struct pthread { /* pthread_set/get_name_np */ char *name; - - /* rtld thread-local dlerror message and seen control */ - char dlerror_msg[512]; - int dlerror_seen; }; #define THR_SHOULD_GC(thrd) \