svn commit: r235385 - in head/contrib/jemalloc: . doc include/jemalloc/internal

[Jason Evans]

Author: jasone
Date: Sun May 13 01:33:28 2012
New Revision: 235385
URL: http://svn.freebsd.org/changeset/base/235385

Log:
  Fix config_lazy_lock so that thread caching isn't used for
  single-threaded applications.

Modified:
  head/contrib/jemalloc/FREEBSD-diffs
  head/contrib/jemalloc/doc/jemalloc.3
  head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h

Modified: head/contrib/jemalloc/FREEBSD-diffs
==============================================================================
--- head/contrib/jemalloc/FREEBSD-diffs	Sun May 13 01:30:27 2012	(r235384)
+++ head/contrib/jemalloc/FREEBSD-diffs	Sun May 13 01:33:28 2012	(r235385)
@@ -45,7 +45,7 @@ index 877c500..7d659a7 100644
 +  </refsect1>
  </refentry>
 diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index 268cd14..cfb1fb9 100644
+index 268cd14..2acd2eb 100644
 --- a/include/jemalloc/internal/jemalloc_internal.h.in
 +++ b/include/jemalloc/internal/jemalloc_internal.h.in
 @@ -1,5 +1,8 @@
@@ -67,6 +67,21 @@ index 268cd14..cfb1fb9 100644
  #define	JEMALLOC_NO_DEMANGLE
  #include "../jemalloc at install_suffix@.h"
  
+@@ -95,13 +101,7 @@ static const bool config_fill =
+     false
+ #endif
+     ;
+-static const bool config_lazy_lock =
+-#ifdef JEMALLOC_LAZY_LOCK
+-    true
+-#else
+-    false
+-#endif
+-    ;
++static const bool config_lazy_lock = true;
+ static const bool config_prof =
+ #ifdef JEMALLOC_PROF
+     true
 diff --git a/include/jemalloc/internal/mutex.h b/include/jemalloc/internal/mutex.h
 index de44e14..564d604 100644
 --- a/include/jemalloc/internal/mutex.h

Modified: head/contrib/jemalloc/doc/jemalloc.3
==============================================================================
--- head/contrib/jemalloc/doc/jemalloc.3	Sun May 13 01:30:27 2012	(r235384)
+++ head/contrib/jemalloc/doc/jemalloc.3	Sun May 13 01:33:28 2012	(r235385)
@@ -2,12 +2,12 @@
 .\"     Title: JEMALLOC
 .\"    Author: Jason Evans
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 05/11/2012
+.\"      Date: 05/12/2012
 .\"    Manual: User Manual
 .\"    Source: jemalloc 3.0.0-0-gfc9b1dbf69f59d7ecfc4ac68da9847e017e1d046
 .\"  Language: English
 .\"
-.TH "JEMALLOC" "3" "05/11/2012" "jemalloc 3.0.0-0-gfc9b1dbf69f5" "User Manual"
+.TH "JEMALLOC" "3" "05/12/2012" "jemalloc 3.0.0-0-gfc9b1dbf69f5" "User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h	Sun May 13 01:30:27 2012	(r235384)
+++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h	Sun May 13 01:33:28 2012	(r235385)
@@ -101,13 +101,7 @@ static const bool config_fill =
     false
 #endif
     ;
-static const bool config_lazy_lock =
-#ifdef JEMALLOC_LAZY_LOCK
-    true
-#else
-    false
-#endif
-    ;
+static const bool config_lazy_lock = true;
 static const bool config_prof =
 #ifdef JEMALLOC_PROF
     true