diff options
| author | jasone <jasone@FreeBSD.org> | 2012-05-13 01:33:28 +0000 |
|---|---|---|
| committer | jasone <jasone@FreeBSD.org> | 2012-05-13 01:33:28 +0000 |
| commit | b17294d4d68b9c90224d6a420f55ab4f26418de3 (patch) | |
| tree | 81df9c1044a3e2176c746a7dc69af9df6028060a | |
| parent | 4ff8331c1b8e7243d13d6e3c842371f4c40b1f64 (diff) | |
| download | FreeBSD-src-b17294d4d68b9c90224d6a420f55ab4f26418de3.zip FreeBSD-src-b17294d4d68b9c90224d6a420f55ab4f26418de3.tar.gz | |
Fix config_lazy_lock so that thread caching isn't used for
single-threaded applications.
| -rw-r--r-- | contrib/jemalloc/FREEBSD-diffs | 17 | ||||
| -rw-r--r-- | contrib/jemalloc/doc/jemalloc.3 | 4 | ||||
| -rw-r--r-- | contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h | 8 |
3 files changed, 19 insertions, 10 deletions
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs index 8906075..e38ff91 100644 --- a/contrib/jemalloc/FREEBSD-diffs +++ b/contrib/jemalloc/FREEBSD-diffs @@ -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@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 diff --git a/contrib/jemalloc/doc/jemalloc.3 b/contrib/jemalloc/doc/jemalloc.3 index a47bc23..f4a9282 100644 --- a/contrib/jemalloc/doc/jemalloc.3 +++ b/contrib/jemalloc/doc/jemalloc.3 @@ -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 .\" ----------------------------------------------------------------- diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h index a7e76f3..32cdc6f 100644 --- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h +++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h @@ -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 |
