From nobody Thu Mar 5 10:30:41 2026 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 4fRQmK6jDmz6SmLG for ; Thu, 05 Mar 2026 10:30:41 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRQmK5wQRz3sjh for ; Thu, 05 Mar 2026 10:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772706641; 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=2atVUUKurYaqvo6cCXBeNGJF8aQQexQwov6HTfOOelM=; b=dH5z9xqawF9EWeo6uhrIkemUvmZtlumHLcW9SlrYHfdbZVtvrlfAaInSBMiVim1p4VavQK uN0RR0D4zVfFF1waLtbBAE/WVBlnimYiFLxNDV+EkiAnxoVZIa64Ba0N2DJcrKc1Rs27nR Z9oBuGVjMXnPPCQT64QExp1wlRlqBiBaMUVRi2Mg4UiBRDHtmZFRzvD5e/eyXQ75QXLYCH lgx53LgurZy2ZvdsJ+c/Opb+8G5COXaYOz51Sn0LFJDgugt5DngbC6VDORtoV5J2XiL4Vs VZWSig8X2Mf2OFlbZsnVbqA0HN08JTv4q+VMahP7AtmTjvJ8Tkyvl4CUgOR5rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772706641; a=rsa-sha256; cv=none; b=IQ5JkhB4jTo5Ansr58/QBf/xU3rrFi/U4TCkkGRihxU255oKVAq46bNvrRLeSqgn17XzUC RceqPG+wzIomw7CcvIrkmNn31l6YDgcm7a31t6R472yFrmZjO70qLWPIRH6DvNf4Vmvurx EHxcMk9h4Bxcl+5HqrXMrVjyHm3pdtORvga9B7/EAc4guvrk8ODGw4gJTMXUvsktMMn1x8 jSP4QzAS2GjIJqsPS6ySfwQj0UlGmI9ijxl6Cm3fTauWmWKvBnvnT4mE1S62iCK75/OrJQ eDluq30eVlYCPmePML1JkTjpor8qIGHLRqe+cbRsGDGFEJ+iLpJWN2SbrgC+sA== 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=1772706641; 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=2atVUUKurYaqvo6cCXBeNGJF8aQQexQwov6HTfOOelM=; b=XynY4+YUiUdaxx4l+advPtEP29yzOmpF/Sv8a6GsT/4juxszd1XScvPnytDzMYDajnEonl egl7PPECvHwoK6XUptzhuG5EkhnorvQVWFlajhRaWX87+36HThM3PujpFEmI1Pq+6mDrQa bojS4fUHcHjNca5esOer62mIX8sIXdG57mX1Uu/slnFVJwihX8gqkZ558RMNU0WPDHtq+z gEGlDBo19/wFzO4BpZas2hNQOwWVdHgR001NwxuVp7iO1Dsm5/JUYNp8RMaiXOemjZXYUD wmofK7wOJSSrS9Jggv3bRABAx2JND5vCc7D4htwQgCa961NrnbRcNmqABSTQbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRQmK5B8xzYk5 for ; Thu, 05 Mar 2026 10:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c585 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 10:30:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: db1ecd5854d4 - main - getnetconfig: make nc_error a thread local variable 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db1ecd5854d4d9ed596d6411a01de0df6e41e629 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 10:30:41 +0000 Message-Id: <69a95b51.3c585.e5364fe@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=db1ecd5854d4d9ed596d6411a01de0df6e41e629 commit db1ecd5854d4d9ed596d6411a01de0df6e41e629 Author: Brooks Davis AuthorDate: 2026-03-05 10:30:30 +0000 Commit: Brooks Davis CommitDate: 2026-03-05 10:30:30 +0000 getnetconfig: make nc_error a thread local variable Remove a bunch of complexity at the cost of 4 bytes of storage per thread. Reviewed by: jhb Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D55310 --- lib/libc/rpc/getnetconfig.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c index 03a4497b21ec..5e78cd19ebf1 100644 --- a/lib/libc/rpc/getnetconfig.c +++ b/lib/libc/rpc/getnetconfig.c @@ -118,7 +118,6 @@ struct netconfig_vars { #define NC_INVALID 0 -static int *__nc_error(void); static int parse_ncp(char *, struct netconfig *); static struct netconfig *dup_ncp(struct netconfig *); @@ -129,46 +128,10 @@ static mutex_t nc_file_lock = MUTEX_INITIALIZER; static struct netconfig_info ni = { 0, 0, NULL, NULL}; static mutex_t ni_lock = MUTEX_INITIALIZER; -static thread_key_t nc_key; -static once_t nc_once = ONCE_INITIALIZER; -static int nc_key_error; - -static void -nc_key_init(void) -{ - - nc_key_error = thr_keycreate(&nc_key, free); -} +static _Thread_local int nc_error = 0; #define MAXNETCONFIGLINE 1000 -static int * -__nc_error(void) -{ - static int nc_error = 0; - int *nc_addr; - - /* - * Use the static `nc_error' if we are the main thread - * (including non-threaded programs), or if an allocation - * fails. - */ - if (thr_main()) - return (&nc_error); - if (thr_once(&nc_once, nc_key_init) != 0 || nc_key_error != 0) - return (&nc_error); - if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) { - nc_addr = (int *)malloc(sizeof (int)); - if (thr_setspecific(nc_key, (void *) nc_addr) != 0) { - free(nc_addr); - return (&nc_error); - } - *nc_addr = 0; - } - return (nc_addr); -} - -#define nc_error (*(__nc_error())) /* * A call to setnetconfig() establishes a /etc/netconfig "session". A session * "handle" is returned on a successful call. At the start of a session (after