From owner-svn-src-all@FreeBSD.ORG  Fri Mar 23 08:26:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 96E55106566B;
	Fri, 23 Mar 2012 08:26:32 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 81C968FC14;
	Fri, 23 Mar 2012 08:26:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2N8QWZD064621;
	Fri, 23 Mar 2012 08:26:32 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2N8QW0m064618;
	Fri, 23 Mar 2012 08:26:32 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201203230826.q2N8QW0m064618@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 23 Mar 2012 08:26:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233345 - head/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Mar 2012 08:26:32 -0000

Author: ed
Date: Fri Mar 23 08:26:31 2012
New Revision: 233345
URL: http://svn.freebsd.org/changeset/base/233345

Log:
  Make utmpx(3) thread safe if we support TLS.
  
  Because the utmpx interface is generally not required to be thread-safe,
  but it is nice to have, if easy to do so. Therefore don't make a mess
  out of the code and only use it if __NO_TLS is not defined.

Modified:
  head/lib/libc/gen/getutxent.c
  head/lib/libc/gen/utxdb.c

Modified: head/lib/libc/gen/getutxent.c
==============================================================================
--- head/lib/libc/gen/getutxent.c	Fri Mar 23 07:52:37 2012	(r233344)
+++ head/lib/libc/gen/getutxent.c	Fri Mar 23 08:26:31 2012	(r233345)
@@ -38,8 +38,13 @@ __FBSDID("$FreeBSD$");
 #include "utxdb.h"
 #include "un-namespace.h"
 
+#ifdef __NO_TLS
 static FILE *uf = NULL;
 static int udb;
+#else
+static _Thread_local FILE *uf = NULL;
+static _Thread_local int udb;
+#endif
 
 int
 setutxdb(int db, const char *file)

Modified: head/lib/libc/gen/utxdb.c
==============================================================================
--- head/lib/libc/gen/utxdb.c	Fri Mar 23 07:52:37 2012	(r233344)
+++ head/lib/libc/gen/utxdb.c	Fri Mar 23 08:26:31 2012	(r233345)
@@ -126,7 +126,11 @@ utx_to_futx(const struct utmpx *ut, stru
 struct utmpx *
 futx_to_utx(const struct futx *fu)
 {
+#ifdef __NO_TLS
 	static struct utmpx *ut;
+#else
+	static _Thread_local struct utmpx *ut;
+#endif
 
 	if (ut == NULL) {
 		ut = calloc(1, sizeof *ut);