From owner-svn-src-head@freebsd.org Tue Aug 18 19:50:20 2015 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 F22C99BD09B for ; Tue, 18 Aug 2015 19:50:20 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from vfemail.net (ninezero.vfemail.net [96.30.253.190]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDDCABF0 for ; Tue, 18 Aug 2015 19:50:20 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: (qmail 23015 invoked by uid 89); 18 Aug 2015 19:50:14 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 18 Aug 2015 19:50:14 -0000 Received: (qmail 22836 invoked by uid 89); 18 Aug 2015 19:49:56 -0000 Received: by simscan 1.3.1 ppid: 22828, pid: 22834, t: 0.0048s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 18 Aug 2015 19:49:56 -0000 Received: (qmail 7696 invoked by uid 89); 18 Aug 2015 19:49:56 -0000 Received: by simscan 1.4.0 ppid: 7666, pid: 7693, t: 0.7217s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 18 Aug 2015 19:49:56 -0000 From: Jan Beich To: Jason Evans Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r286866 - in head: contrib/jemalloc contrib/jemalloc/doc contrib/jemalloc/include/jemalloc contrib/jemalloc/include/jemalloc/internal contrib/jemalloc/src include lib/libc/gen lib/libc/... References: <201508180021.t7I0LQwE016289@repo.freebsd.org> Date: Tue, 18 Aug 2015 21:49:44 +0200 In-Reply-To: (Jason Evans's message of "Tue, 18 Aug 2015 01:46:29 -0700") Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 18 Aug 2015 19:50:21 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jason Evans writes: >>> Index: include/malloc_np.h [...] >>> +typedef void *(chunk_alloc_t)(void *, size_t, size_t, bool *, bool *, = unsigned); >>> +typedef bool (chunk_dalloc_t)(void *, size_t, bool, unsigned); malloc_np.h changes regressing consumers isn't surprising given the lack of tests for jemalloc shipped with FreeBSD. $ cc -include malloc_np.h -c -xc -:311: In file included from :1: /usr/include/malloc_np.h:39:55: error: unknown type name 'bool' typedef void *(chunk_alloc_t)(void *, size_t, size_t, bool *, bool *, uns= igned); ^ /usr/include/malloc_np.h:39:63: error: unknown type name 'bool' typedef void *(chunk_alloc_t)(void *, size_t, size_t, bool *, bool *, uns= igned); ^ [...] >>> + - Remove the --enable-dss options, and make dss non-optional on all = platforms >>> + which support sbrk(2). FREEBSD-upgrade still references it. >>> Modified: head/contrib/jemalloc/doc/jemalloc.3 [...] >>> @@ -53,8 +51,7 @@ make variable)\&. >>> .sp >>> .ft B >>> .nf >>> -#include >>> -#include >>> +#include Bad rebase. >>> + - Add sdallocx(), which implements sized deallocation. The primary >>> + optimization over dallocx() is the removal of a metadata read, whi= ch often >>> + suffers an L1 cache miss. >> [...] >>> + - Remove the *allocm() API, which is superseded by the *allocx() API. >>=20 >> Symbol.map and manpages haven't been updated. >> [...] > > Committed; thanks! Stale links have to be removed as well. Index: contrib/jemalloc/FREEBSD-diffs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- contrib/jemalloc/FREEBSD-diffs (revision 286894) +++ contrib/jemalloc/FREEBSD-diffs (working copy) @@ -20,7 +20,14 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xm SYNOPSIS =2D@@ -2759,4 +2770,18 @@ malloc_conf =3D "lg_chunk:24";]]> + +- #include <jemal= loc/jemalloc.h> ++ #include <stdli= b.h> ++#include <malloc_np.h> + + Standard API + +@@ -2759,4 +2771,18 @@ malloc_conf =3D "lg_chunk:24";]]><= /para> The posix_memalign function co= nforms to IEEE Std 1003.1-2001 (“POSIX.1”). Index: contrib/jemalloc/FREEBSD-upgrade =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- contrib/jemalloc/FREEBSD-upgrade (revision 286894) +++ contrib/jemalloc/FREEBSD-upgrade (working copy) @@ -72,7 +72,7 @@ do_extract() { patch -p1 < "${src}/FREEBSD-diffs" find . -name '*.orig' -delete # Generate various files. =2D ./autogen.sh --enable-cc-silence --enable-dss --enable-xmalloc \ + ./autogen.sh --enable-cc-silence --enable-xmalloc \ --enable-utrace --with-xslroot=3D/usr/local/share/xsl/docbook \ --with-private-namespace=3D__ --with-lg-page-sizes=3D12,13,14,16 gmake dist Index: contrib/jemalloc/doc/jemalloc.3 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- contrib/jemalloc/doc/jemalloc.3 (revision 286894) +++ contrib/jemalloc/doc/jemalloc.3 (working copy) @@ -51,7 +51,8 @@ make variable)\&. .sp .ft B .nf =2D#include +#include +#include .fi .ft .SS "Standard API" Index: include/malloc_np.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- include/malloc_np.h (revision 286893) +++ include/malloc_np.h (working copy) @@ -33,6 +33,7 @@ #define _MALLOC_NP_H_ #include #include +#include #include =20 __BEGIN_DECLS Index: ObsoleteFiles.inc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- ObsoleteFiles.inc (revision 286893) +++ ObsoleteFiles.inc (working copy) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done =20 +# 20150818: *allocm() are gone in jemalloc 4.0.0 +OLD_FILES+=3Dusr/share/man/man3/allocm.3.gz +OLD_FILES+=3Dusr/share/man/man3/dallocm.3.gz +OLD_FILES+=3Dusr/share/man/man3/nallocm.3.gz +OLD_FILES+=3Dusr/share/man/man3/rallocm.3.gz +OLD_FILES+=3Dusr/share/man/man3/sallocm.3.gz # 20150802: Remove netbsd's test on pw(8) OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_test # 20150719: Remove libarchive.pc --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJV04xYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bncsH+gPc5BPkP/FPwSDZBRrLsXtN zXzamcOXGeg1uikVc7XaFP7b/bCkpaTCnPENVxQ3kXZwff57G+E3+xGJqYbLKGX/ FE4a5SqQdNr3v5ccenoYXhCMRxeEvwQHEwUunyTdHLEYM5TgFUMvBrUyKjbnLx84 3Jheu7GkAykwyFh1B6zEnP4sYP+JdpqTAJkZ1dLY6oERDb+XQaCuszaN/24MOYvG rOEaPjLl0uFF2cplUdrJ2fDX8lRkgONehz071DWOI+GtNhDNft9AL1ylHLwI7pXz kV26WxWDyF5mIjL/klt3dJgYWMT+HQ3LdMNsEKqJv3oMjqIryRSXeMnyzxXCaTc= =cE2k -----END PGP SIGNATURE----- --=-=-=--