From owner-svn-src-all@freebsd.org Wed Aug 19 00:06:49 2015 Return-Path: Delivered-To: svn-src-all@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 226749BC559; Wed, 19 Aug 2015 00:06:49 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 0BB33106; Wed, 19 Aug 2015 00:06:49 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7J06m58006811; Wed, 19 Aug 2015 00:06:48 GMT (envelope-from jasone@FreeBSD.org) Received: (from jasone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7J06lgO006806; Wed, 19 Aug 2015 00:06:47 GMT (envelope-from jasone@FreeBSD.org) Message-Id: <201508190006.t7J06lgO006806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jasone set sender to jasone@FreeBSD.org using -f From: Jason Evans Date: Wed, 19 Aug 2015 00:06:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286911 - in head: . contrib/jemalloc contrib/jemalloc/doc include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2015 00:06:49 -0000 Author: jasone Date: Wed Aug 19 00:06:46 2015 New Revision: 286911 URL: https://svnweb.freebsd.org/changeset/base/286911 Log: Fix minor malloc regressions. - Use _Bool rather than bool to resolve missing type errors in malloc_np.h. - Fix malloc manual page #include documentation. - Add *allocm manual pages to obsolete files. Submitted by: jbeich Modified: head/ObsoleteFiles.inc head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/FREEBSD-upgrade head/contrib/jemalloc/doc/jemalloc.3 head/include/malloc_np.h Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Aug 18 22:37:25 2015 (r286910) +++ head/ObsoleteFiles.inc Wed Aug 19 00:06:46 2015 (r286911) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20150818: *allocm() are gone in jemalloc 4.0.0 +OLD_FILES+=usr/share/man/man3/allocm.3.gz +OLD_FILES+=usr/share/man/man3/dallocm.3.gz +OLD_FILES+=usr/share/man/man3/nallocm.3.gz +OLD_FILES+=usr/share/man/man3/rallocm.3.gz +OLD_FILES+=usr/share/man/man3/sallocm.3.gz # 20150802: Remove netbsd's test on pw(8) OLD_FILES+=usr/tests/usr.sbin/pw/pw_test # 20150719: Remove libarchive.pc Modified: head/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- head/contrib/jemalloc/FREEBSD-diffs Tue Aug 18 22:37:25 2015 (r286910) +++ head/contrib/jemalloc/FREEBSD-diffs Wed Aug 19 00:06:46 2015 (r286911) @@ -1,8 +1,8 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index 8fc774b..47b453c 100644 +index 8fc774b..fdbef95 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in -@@ -53,6 +53,17 @@ +@@ -53,11 +53,23 @@ This manual describes jemalloc @jemalloc_version@. More information can be found at the jemalloc website. @@ -20,7 +20,14 @@ index 8fc774b..47b453c 100644 SYNOPSIS -@@ -2759,4 +2770,18 @@ malloc_conf = "lg_chunk:24";]]> + +- #include <jemalloc/jemalloc.h> ++ #include <stdlib.h> ++#include <malloc_np.h> + + Standard API + +@@ -2759,4 +2771,18 @@ malloc_conf = "lg_chunk:24";]]> The posix_memalign function conforms to IEEE Std 1003.1-2001 (“POSIX.1”). Modified: head/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- head/contrib/jemalloc/FREEBSD-upgrade Tue Aug 18 22:37:25 2015 (r286910) +++ head/contrib/jemalloc/FREEBSD-upgrade Wed Aug 19 00:06:46 2015 (r286911) @@ -72,9 +72,9 @@ do_extract() { patch -p1 < "${src}/FREEBSD-diffs" find . -name '*.orig' -delete # Generate various files. - ./autogen.sh --enable-cc-silence --enable-dss --enable-xmalloc \ - --enable-utrace --with-xslroot=/usr/local/share/xsl/docbook \ - --with-private-namespace=__ --with-lg-page-sizes=12,13,14,16 + ./autogen.sh --enable-cc-silence --enable-xmalloc --enable-utrace \ + --with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \ + --with-lg-page-sizes=12,13,14,16 gmake dist ) } Modified: head/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- head/contrib/jemalloc/doc/jemalloc.3 Tue Aug 18 22:37:25 2015 (r286910) +++ head/contrib/jemalloc/doc/jemalloc.3 Wed Aug 19 00:06:46 2015 (r286911) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 08/17/2015 +.\" Date: 08/18/2015 .\" Manual: User Manual .\" Source: jemalloc 4.0.0-0-g6e98caf8f064482b9ab292ef3638dea67420bbc2 .\" Language: English .\" -.TH "JEMALLOC" "3" "08/17/2015" "jemalloc 4.0.0-0-g6e98caf8f064" "User Manual" +.TH "JEMALLOC" "3" "08/18/2015" "jemalloc 4.0.0-0-g6e98caf8f064" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -51,7 +51,8 @@ make variable)\&. .sp .ft B .nf -#include +#include +#include .fi .ft .SS "Standard API" Modified: head/include/malloc_np.h ============================================================================== --- head/include/malloc_np.h Tue Aug 18 22:37:25 2015 (r286910) +++ head/include/malloc_np.h Wed Aug 19 00:06:46 2015 (r286911) @@ -36,13 +36,14 @@ #include __BEGIN_DECLS -typedef void *(chunk_alloc_t)(void *, size_t, size_t, bool *, bool *, unsigned); -typedef bool (chunk_dalloc_t)(void *, size_t, bool, unsigned); -typedef bool (chunk_commit_t)(void *, size_t, size_t, size_t, unsigned); -typedef bool (chunk_decommit_t)(void *, size_t, size_t, size_t, unsigned); -typedef bool (chunk_purge_t)(void *, size_t, size_t, size_t, unsigned); -typedef bool (chunk_split_t)(void *, size_t, size_t, size_t, bool, unsigned); -typedef bool (chunk_merge_t)(void *, size_t, void *, size_t, bool, unsigned); +typedef void *(chunk_alloc_t)(void *, size_t, size_t, _Bool *, _Bool *, + unsigned); +typedef _Bool (chunk_dalloc_t)(void *, size_t, _Bool, unsigned); +typedef _Bool (chunk_commit_t)(void *, size_t, size_t, size_t, unsigned); +typedef _Bool (chunk_decommit_t)(void *, size_t, size_t, size_t, unsigned); +typedef _Bool (chunk_purge_t)(void *, size_t, size_t, size_t, unsigned); +typedef _Bool (chunk_split_t)(void *, size_t, size_t, size_t, _Bool, unsigned); +typedef _Bool (chunk_merge_t)(void *, size_t, void *, size_t, _Bool, unsigned); typedef struct { chunk_alloc_t *alloc; chunk_dalloc_t *dalloc;