Skip to content

Commit 151f759

Browse files
VivekSainiEQJohnSully
authored andcommitted
Updated jemalloc to version 5.2.1
1 parent 318fcb6 commit 151f759

File tree

153 files changed

+10729
-2824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+10729
-2824
lines changed

Diff for: deps/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
8686

8787
jemalloc: .make-prerequisites
8888
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
89-
cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
89+
cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
9090
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
9191

9292
.PHONY: jemalloc

Diff for: deps/jemalloc/.appveyor.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ environment:
55
- MSYSTEM: MINGW64
66
CPU: x86_64
77
MSVC: amd64
8+
CONFIG_FLAGS: --enable-debug
9+
- MSYSTEM: MINGW64
10+
CPU: x86_64
11+
CONFIG_FLAGS: --enable-debug
812
- MSYSTEM: MINGW32
913
CPU: i686
1014
MSVC: x86
11-
- MSYSTEM: MINGW64
12-
CPU: x86_64
15+
CONFIG_FLAGS: --enable-debug
1316
- MSYSTEM: MINGW32
1417
CPU: i686
18+
CONFIG_FLAGS: --enable-debug
1519
- MSYSTEM: MINGW64
1620
CPU: x86_64
1721
MSVC: amd64
18-
CONFIG_FLAGS: --enable-debug
22+
- MSYSTEM: MINGW64
23+
CPU: x86_64
1924
- MSYSTEM: MINGW32
2025
CPU: i686
2126
MSVC: x86
22-
CONFIG_FLAGS: --enable-debug
23-
- MSYSTEM: MINGW64
24-
CPU: x86_64
25-
CONFIG_FLAGS: --enable-debug
2627
- MSYSTEM: MINGW32
2728
CPU: i686
28-
CONFIG_FLAGS: --enable-debug
2929

3030
install:
3131
- set PATH=c:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%

Diff for: deps/jemalloc/.cirrus.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
env:
2+
CIRRUS_CLONE_DEPTH: 1
3+
ARCH: amd64
4+
5+
task:
6+
freebsd_instance:
7+
matrix:
8+
image: freebsd-12-0-release-amd64
9+
image: freebsd-11-2-release-amd64
10+
install_script:
11+
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
12+
- pkg upgrade -y
13+
- pkg install -y autoconf gmake
14+
script:
15+
- autoconf
16+
#- ./configure ${COMPILER_FLAGS:+ CC="$CC $COMPILER_FLAGS" CXX="$CXX $COMPILER_FLAGS" } $CONFIGURE_FLAGS
17+
- ./configure
18+
- export JFLAG=`sysctl -n kern.smp.cpus`
19+
- gmake -j${JFLAG}
20+
- gmake -j${JFLAG} tests
21+
- gmake check

Diff for: deps/jemalloc/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
/include/jemalloc/internal/public_namespace.h
3131
/include/jemalloc/internal/public_symbols.txt
3232
/include/jemalloc/internal/public_unnamespace.h
33-
/include/jemalloc/internal/size_classes.h
3433
/include/jemalloc/jemalloc.h
3534
/include/jemalloc/jemalloc_defs.h
3635
/include/jemalloc/jemalloc_macros.h

Diff for: deps/jemalloc/.travis.yml

+72-33
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ matrix:
1111
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
1212
- os: linux
1313
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
14-
addons:
14+
addons: &gcc_multilib
1515
apt:
1616
packages:
1717
- gcc-multilib
@@ -21,6 +21,10 @@ matrix:
2121
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2222
- os: linux
2323
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
24+
- os: linux
25+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
26+
- os: linux
27+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2428
- os: linux
2529
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2630
- os: linux
@@ -37,20 +41,25 @@ matrix:
3741
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
3842
- os: osx
3943
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
44+
- os: osx
45+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
46+
- os: osx
47+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
4048
- os: osx
4149
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
4250
- os: linux
4351
env: CC=clang CXX=clang++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
44-
addons:
45-
apt:
46-
packages:
47-
- gcc-multilib
52+
addons: *gcc_multilib
4853
- os: linux
4954
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5055
- os: linux
5156
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5257
- os: linux
5358
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
59+
- os: linux
60+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
61+
- os: linux
62+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5463
- os: linux
5564
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5665
- os: linux
@@ -61,50 +70,39 @@ matrix:
6170
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
6271
- os: linux
6372
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
64-
addons:
65-
apt:
66-
packages:
67-
- gcc-multilib
73+
addons: *gcc_multilib
6874
- os: linux
6975
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
70-
addons:
71-
apt:
72-
packages:
73-
- gcc-multilib
76+
addons: *gcc_multilib
7477
- os: linux
7578
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
76-
addons:
77-
apt:
78-
packages:
79-
- gcc-multilib
79+
addons: *gcc_multilib
80+
- os: linux
81+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
82+
addons: *gcc_multilib
83+
- os: linux
84+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
85+
addons: *gcc_multilib
8086
- os: linux
8187
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
82-
addons:
83-
apt:
84-
packages:
85-
- gcc-multilib
88+
addons: *gcc_multilib
8689
- os: linux
8790
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
88-
addons:
89-
apt:
90-
packages:
91-
- gcc-multilib
91+
addons: *gcc_multilib
9292
- os: linux
9393
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
94-
addons:
95-
apt:
96-
packages:
97-
- gcc-multilib
94+
addons: *gcc_multilib
9895
- os: linux
9996
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
100-
addons:
101-
apt:
102-
packages:
103-
- gcc-multilib
97+
addons: *gcc_multilib
10498
- os: linux
10599
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
106100
- os: linux
107101
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
102+
- os: linux
103+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
104+
- os: linux
105+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
108106
- os: linux
109107
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
110108
- os: linux
@@ -115,6 +113,10 @@ matrix:
115113
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
116114
- os: linux
117115
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
116+
- os: linux
117+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
118+
- os: linux
119+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
118120
- os: linux
119121
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
120122
- os: linux
@@ -123,6 +125,10 @@ matrix:
123125
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
124126
- os: linux
125127
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
128+
- os: linux
129+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --disable-libdl" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
130+
- os: linux
131+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
126132
- os: linux
127133
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
128134
- os: linux
@@ -131,6 +137,24 @@ matrix:
131137
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
132138
- os: linux
133139
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
140+
- os: linux
141+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl --enable-opt-safety-checks" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
142+
- os: linux
143+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
144+
- os: linux
145+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl --with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
146+
- os: linux
147+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
148+
- os: linux
149+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-libdl --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
150+
- os: linux
151+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
152+
- os: linux
153+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks --with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
154+
- os: linux
155+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
156+
- os: linux
157+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-opt-safety-checks --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
134158
- os: linux
135159
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false,dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
136160
- os: linux
@@ -143,10 +167,25 @@ matrix:
143167
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary,background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
144168
- os: linux
145169
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu,background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
170+
# Development build
171+
- os: linux
172+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-cache-oblivious --enable-stats --enable-log --enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
173+
# --enable-expermental-smallocx:
174+
- os: linux
175+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --enable-experimental-smallocx --enable-stats --enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
176+
177+
# Valgrind
178+
- os: linux
179+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds" JEMALLOC_TEST_PREFIX="valgrind"
180+
addons:
181+
apt:
182+
packages:
183+
- valgrind
146184

147185

148186
before_script:
149187
- autoconf
188+
- scripts/gen_travis.py > travis_script && diff .travis.yml travis_script
150189
- ./configure ${COMPILER_FLAGS:+ CC="$CC $COMPILER_FLAGS" CXX="$CXX $COMPILER_FLAGS" } $CONFIGURE_FLAGS
151190
- make -j3
152191
- make -j3 tests

Diff for: deps/jemalloc/COPYING

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Unless otherwise specified, files in the jemalloc source distribution are
22
subject to the following license:
33
--------------------------------------------------------------------------------
4-
Copyright (C) 2002-2018 Jason Evans <[email protected]>.
4+
Copyright (C) 2002-present Jason Evans <[email protected]>.
55
All rights reserved.
66
Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
7-
Copyright (C) 2009-2018 Facebook, Inc. All rights reserved.
7+
Copyright (C) 2009-present Facebook, Inc. All rights reserved.
88

99
Redistribution and use in source and binary forms, with or without
1010
modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)