From nobody Thu Feb 03 02:49:26 2022 X-Original-To: dev-commits-src-main@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 4AE6719A0C72; Thu, 3 Feb 2022 02:49:27 +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 4Jq36G64xsz4Zp7; Thu, 3 Feb 2022 02:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856566; 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=Ke25DnmX6NwmGM+9zRrgS73d7Ufme+K4WsZCkZEseYo=; b=mdNVOBolQDGcCRFYKtCZK1tVU7h8Fqv7JPd1PxBuEfhoFxA3St3TYpn5Tb9neuIGDprYkV 0XeBRdk63Ok6DQ5sXu4kgYzYgo6foy0H2yA/l0LZZ85VYLlce8uw2kJAWBTs6+YOZMgORl KO3JuBY48lee1F3tEhCj2DPvR05d9XEJsm7IwCOPiF1YgXRkHh7x1dtR/DsRFuSgHugjE9 uSkKYHDy7JbZ4HNRiqyCV51+0kLMilDKu6R1LOuobIifyYW5+A7+rB0ZZivNLeRYMw2aQ0 ttUwzl5cGezZxuyrzbbZmj9ECTkeqdcGsfn0IUXIUKRXUQ8g3kA74+qIEWDs5g== 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 A29B67E2A; Thu, 3 Feb 2022 02:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2132nQef086948; Thu, 3 Feb 2022 02:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2132nQc3086947; Thu, 3 Feb 2022 02:49:26 GMT (envelope-from git) Date: Thu, 3 Feb 2022 02:49:26 GMT Message-Id: <202202030249.2132nQc3086947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fcdf9d7de536 - main - xlocale.c:init_key(): do not ignore errors from pthread_key_create() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fcdf9d7de5363259e33be29bccc8b2b5dc091af8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856566; 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=Ke25DnmX6NwmGM+9zRrgS73d7Ufme+K4WsZCkZEseYo=; b=wi0/Y8ras7WNGKGyhnYz2umOZLiNchsV36Io3REUidEHkFWZv0k2yJKVmj9Q9rRtXY7jNP uIebFKtA8sdfxP7ljOwctrNF4LxHLQB934CJO0LIoIOf5U8JoHSFed/dFadpHHWNUhnKXp 7Cer52COJvBW6pVxf0mxWSnHq9Vj+LpJGimByuBWCUVDhpXeTpZnDhSrSI7XlyZ57RKgbt o5klYb7wjeV2M1gcnKx7SKE4juxoIN2ybz09gui0U0g3m4lfN0HzWPdLImTWsL/Vpzu9U2 Jk87J888mLevjVX/KniYljEsez3rqAjKhjjE0mpWOJn1SeoiTXhPkMigNe+1NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643856566; a=rsa-sha256; cv=none; b=Fn3JidM9/NDXyVuU2MNvt5kBOiAypfkf2a255DoBlHMK7Q7+nboH/VKZO/PRFUWUneKA0T iMG64LzN8n6h4R8XFtUkIzfG2dGDyD9ztINjqifns1X1GLoSrrCLyB2lK+Y26JBK8Loxze BO8jJodYI7Gg9cyM6SEzZf15X4h3gS1pC2mEgUGBXpatu6ScaWMY/s5zZpXIgQWlsAXwyr 195pe4o8GyxVWz3ZKhAhl0133GY0eTCtywlNy2Yyxl9vNXnU3n1kofVq+2WfnXWfWIN3Fg Fn1U7/kwOi6sFHDv3OhgHfFm/nzkoMdy1ZND+DkMuPBw1eAf7ZFBWlzyWAxdEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fcdf9d7de5363259e33be29bccc8b2b5dc091af8 commit fcdf9d7de5363259e33be29bccc8b2b5dc091af8 Author: Konstantin Belousov AuthorDate: 2022-02-02 17:23:55 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-03 01:02:58 +0000 xlocale.c:init_key(): do not ignore errors from pthread_key_create() Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34140 --- lib/libc/locale/xlocale.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c index 528403693ad4..e07568775394 100644 --- a/lib/libc/locale/xlocale.c +++ b/lib/libc/locale/xlocale.c @@ -117,11 +117,16 @@ static locale_t thread_local_locale; static void init_key(void) { + int error; - pthread_key_create(&locale_info_key, xlocale_release); - pthread_setspecific(locale_info_key, (void*)42); - if (pthread_getspecific(locale_info_key) == (void*)42) { - pthread_setspecific(locale_info_key, 0); + error = pthread_key_create(&locale_info_key, xlocale_release); + if (error == 0) { + pthread_setspecific(locale_info_key, (void*)42); + if (pthread_getspecific(locale_info_key) == (void*)42) { + pthread_setspecific(locale_info_key, 0); + } else { + fake_tls = 1; + } } else { fake_tls = 1; }