FreeBSD Mail Archives

Date:      Tue, 18 Aug 2015 21:49:44 +0200
From:      Jan Beich <jbeich@FreeBSD.org>
To:        Jason Evans <jasone@freebsd.org>
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/...
Message-ID:  <r3n0-74x3-wny@FreeBSD.org>
In-Reply-To: <C355793A-7EFE-4E6E-ACBF-5F772F6AC1E7@freebsd.org> (Jason Evans's message of "Tue, 18 Aug 2015 01:46:29 -0700")
References:  <201508180021.t7I0LQwE016289@repo.freebsd.org> <pp2l-jjsm-wny@FreeBSD.org> <C355793A-7EFE-4E6E-ACBF-5F772F6AC1E7@freebsd.org>

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Jason Evans <jasone@freebsd.org> 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 -</dev/null
  In file included from <built-in>:311:
  In file included from <command line>: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 <stdlib\&.h>
>>> -#include <malloc_np\&.h>
>>> +#include <jemalloc/jemalloc\&.h>

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
    </refsect1>
    <refsynopsisdiv>
      <title>SYNOPSIS</title>
=2D@@ -2759,4 +2770,18 @@ malloc_conf =3D "lg_chunk:24";]]></programlisting=
></para>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;<filename class=3D"headerfile">jemal=
loc/jemalloc.h</filename>&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;<filename class=3D"headerfile">stdli=
b.h</filename>&gt;
++#include &lt;<filename class=3D"headerfile">malloc_np.h</filename>&gt;</f=
uncsynopsisinfo>
+       <refsect2>
+         <title>Standard API</title>
+         <funcprototype>
+@@ -2759,4 +2771,18 @@ malloc_conf =3D "lg_chunk:24";]]></programlisting><=
/para>
      <para>The <function>posix_memalign<parameter/></function> function co=
nforms
      to IEEE Std 1003.1-2001 (&ldquo;POSIX.1&rdquo;).</para>
    </refsect1>
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 <jemalloc/jemalloc\&.h>
+#include <stdlib\&.h>
+#include <malloc_np\&.h>
 .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 <sys/cdefs.h>
 #include <sys/types.h>
+#include <stdbool.h>
 #include <strings.h>
=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-----
--=-=-=--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?r3n0-74x3-wny>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation