From owner-p4-projects@FreeBSD.ORG  Sun Mar 20 03:53:18 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A4ECE16A4D1; Sun, 20 Mar 2005 03:53:17 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 67F0716A4CF
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 03:53:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4C72B43D1D
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 03:53:17 +0000 (GMT)
	(envelope-from davidxu@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2K3rH0V068548
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 03:53:17 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2K3rH09068545
	for perforce@freebsd.org; Sun, 20 Mar 2005 03:53:17 GMT
	(envelope-from davidxu@freebsd.org)
Date: Sun, 20 Mar 2005 03:53:17 GMT
Message-Id: <200503200353.j2K3rH09068545@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 73558 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Mar 2005 03:53:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=73558

Change 73558 by davidxu@davidxu_alona on 2005/03/20 03:52:51

	Add missing lock code for tls.

Affected files ...

.. //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.c#4 edit

Differences ...

==== //depot/projects/davidxu_thread/src/libexec/rtld-elf/rtld.c#4 (text+ko) ====

@@ -2486,12 +2486,14 @@
 tls_get_addr_common(Elf_Addr** dtvp, int index, size_t offset)
 {
     Elf_Addr* dtv = *dtvp;
+    int lockstate;
 
     /* Check dtv generation in case new modules have arrived */
     if (dtv[0] != tls_dtv_generation) {
 	Elf_Addr* newdtv;
 	int to_copy;
 
+	lockstate = wlock_acquire(rtld_bind_lock);
 	newdtv = calloc(1, (tls_max_index + 2) * sizeof(Elf_Addr));
 	to_copy = dtv[1];
 	if (to_copy > tls_max_index)
@@ -2500,13 +2502,17 @@
 	newdtv[0] = tls_dtv_generation;
 	newdtv[1] = tls_max_index;
 	free(dtv);
+	wlock_release(rtld_bind_lock, lockstate);
 	*dtvp = newdtv;
     }
 
     /* Dynamically allocate module TLS if necessary */
-    if (!dtv[index + 1])
-	dtv[index + 1] = (Elf_Addr)allocate_module_tls(index);
-
+    if (!dtv[index + 1]) {
+	lockstate = wlock_acquire(rtld_bind_lock);
+	if (!dtv[index + 1])
+	    dtv[index + 1] = (Elf_Addr)allocate_module_tls(index);
+	wlock_release(rtld_bind_lock, lockstate);
+    }
     return (void*) (dtv[index + 1] + offset);
 }
 
@@ -2796,11 +2802,21 @@
 void *
 _rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign)
 {
-    return allocate_tls(obj_list, oldtls, tcbsize, tcbalign);
+    void *ret;
+    int lockstate;
+
+    lockstate = wlock_acquire(rtld_bind_lock);
+    ret = allocate_tls(obj_list, oldtls, tcbsize, tcbalign);
+    wlock_release(rtld_bind_lock, lockstate);
+    return (ret);
 }
 
 void
 _rtld_free_tls(void *tcb, size_t tcbsize, size_t tcbalign)
 {
+    int lockstate;
+
+    lockstate = wlock_acquire(rtld_bind_lock);
     free_tls(tcb, tcbsize, tcbalign);
+    wlock_release(rtld_bind_lock, lockstate);
 }