From owner-svn-src-all@FreeBSD.ORG  Sun Jun 13 01:13:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 080281065670;
	Sun, 13 Jun 2010 01:13:37 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EAE958FC15;
	Sun, 13 Jun 2010 01:13:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5D1DaCi067451;
	Sun, 13 Jun 2010 01:13:36 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5D1Da1b067449;
	Sun, 13 Jun 2010 01:13:36 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201006130113.o5D1Da1b067449@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 13 Jun 2010 01:13:36 +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: r209117 - head/lib/libc/stdlib
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: Sun, 13 Jun 2010 01:13:37 -0000

Author: cperciva
Date: Sun Jun 13 01:13:36 2010
New Revision: 209117
URL: http://svn.freebsd.org/changeset/base/209117

Log:
  In threaded processes, destroy the mutex atexit_mutex when we've
  finished using it.  This allows the mutex's allocated memory to be
  freed.
  
  This is one sense a rather silly change, since at this point we're
  less than a microsecond away from calling _exit; but fixing this
  memory leak is likely to make life easier for anyone trying to
  track down other memory leaks.

Modified:
  head/lib/libc/stdlib/atexit.c

Modified: head/lib/libc/stdlib/atexit.c
==============================================================================
--- head/lib/libc/stdlib/atexit.c	Sat Jun 12 22:33:04 2010	(r209116)
+++ head/lib/libc/stdlib/atexit.c	Sun Jun 13 01:13:36 2010	(r209117)
@@ -54,6 +54,7 @@ static pthread_mutex_t atexit_mutex = PT
 
 #define _MUTEX_LOCK(x)		if (__isthreaded) _pthread_mutex_lock(x)
 #define _MUTEX_UNLOCK(x)	if (__isthreaded) _pthread_mutex_unlock(x)
+#define _MUTEX_DESTROY(x)	if (__isthreaded) _pthread_mutex_destroy(x)
 
 struct atexit {
 	struct atexit *next;			/* next in list */
@@ -182,4 +183,6 @@ __cxa_finalize(void *dso)
 		}
 	}
 	_MUTEX_UNLOCK(&atexit_mutex);
+	if (dso == NULL)
+		_MUTEX_DESTROY(&atexit_mutex);
 }