From owner-svn-src-head@freebsd.org Fri Jun 30 17:45:53 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54805D96D61; Fri, 30 Jun 2017 17:45:53 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 163D076CE9; Fri, 30 Jun 2017 17:45:53 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5UHjqVa033446; Fri, 30 Jun 2017 17:45:52 GMT (envelope-from jasone@FreeBSD.org) Received: (from jasone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5UHjpdX033442; Fri, 30 Jun 2017 17:45:51 GMT (envelope-from jasone@FreeBSD.org) Message-Id: <201706301745.v5UHjpdX033442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jasone set sender to jasone@FreeBSD.org using -f From: Jason Evans Date: Fri, 30 Jun 2017 17:45:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320504 - in head/contrib/jemalloc: . doc include/jemalloc/internal X-SVN-Group: head X-SVN-Commit-Author: jasone X-SVN-Commit-Paths: in head/contrib/jemalloc: . doc include/jemalloc/internal X-SVN-Commit-Revision: 320504 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2017 17:45:53 -0000 Author: jasone Date: Fri Jun 30 17:45:51 2017 New Revision: 320504 URL: https://svnweb.freebsd.org/changeset/base/320504 Log: Default the abort_conf malloc option to false. This avoids troublesome backward compatibility issues. Modified: head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/FREEBSD-upgrade head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Modified: head/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- head/contrib/jemalloc/FREEBSD-diffs Fri Jun 30 17:43:13 2017 (r320503) +++ head/contrib/jemalloc/FREEBSD-diffs Fri Jun 30 17:45:51 2017 (r320504) @@ -1,8 +1,8 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index 21e401ac..f977c5f5 100644 +index 21e401ac..c26f9f4a 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in -@@ -53,11 +53,21 @@ +@@ -53,11 +53,22 @@ This manual describes jemalloc @jemalloc_version@. More information can be found at the jemalloc website. @@ -10,7 +10,8 @@ index 21e401ac..f977c5f5 100644 + The following configuration options are enabled in libc's built-in + jemalloc: , + , , -+ , and . ++ , , and ++ . + Additionally, is enabled in development + versions of FreeBSD (controlled by the + MALLOC_PRODUCTION make variable). @@ -25,7 +26,7 @@ index 21e401ac..f977c5f5 100644 Standard API -@@ -3252,4 +3262,18 @@ malloc_conf = "narenas:1";]]> +@@ -3252,4 +3263,18 @@ malloc_conf = "narenas:1";]]> The posix_memalign() function conforms to IEEE Std 1003.1-2001 (POSIX.1). Modified: head/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- head/contrib/jemalloc/FREEBSD-upgrade Fri Jun 30 17:43:13 2017 (r320503) +++ head/contrib/jemalloc/FREEBSD-upgrade Fri Jun 30 17:45:51 2017 (r320504) @@ -96,6 +96,7 @@ do_extract_helper() { do_autogen() { ./autogen.sh --enable-xmalloc --enable-utrace \ + --with-malloc-conf=abort_conf:false \ --with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \ --with-lg-page-sizes=12,13,14,16 } Modified: head/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- head/contrib/jemalloc/doc/jemalloc.3 Fri Jun 30 17:43:13 2017 (r320503) +++ head/contrib/jemalloc/doc/jemalloc.3 Fri Jun 30 17:45:51 2017 (r320504) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 06/14/2017 +.\" Date: 06/29/2017 .\" Manual: User Manual .\" Source: jemalloc 5.0.0-4-g84f6c2cae0fb1399377ef6aea9368444c4987cc6 .\" Language: English .\" -.TH "JEMALLOC" "3" "06/14/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual" +.TH "JEMALLOC" "3" "06/29/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -38,8 +38,9 @@ The following configuration options are enabled in lib \fB\-\-enable\-fill\fR, \fB\-\-enable\-lazy\-lock\fR, \fB\-\-enable\-stats\fR, -\fB\-\-enable\-utrace\fR, and -\fB\-\-enable\-xmalloc\fR\&. Additionally, +\fB\-\-enable\-utrace\fR, +\fB\-\-enable\-xmalloc\fR, and +\fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally, \fB\-\-enable\-debug\fR is enabled in development versions of FreeBSD (controlled by the \fBMALLOC_PRODUCTION\fR Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h ============================================================================== --- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Fri Jun 30 17:43:13 2017 (r320503) +++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Fri Jun 30 17:45:51 2017 (r320504) @@ -329,7 +329,7 @@ /* #undef JEMALLOC_EXPORT */ /* config.malloc_conf options string. */ -#define JEMALLOC_CONFIG_MALLOC_CONF "" +#define JEMALLOC_CONFIG_MALLOC_CONF "abort_conf:false" /* If defined, jemalloc takes the malloc/free/etc. symbol names. */ #define JEMALLOC_IS_MALLOC 1