Skip to content

Commit 5018fe3

Browse files
jasonejasone
committed
Merge branch 'dev'
2 parents 04380e7 + ba29113 commit 5018fe3

File tree

258 files changed

+26430
-23202
lines changed

Some content is hidden

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

258 files changed

+26430
-23202
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install:
3636
build_script:
3737
- bash -c "autoconf"
3838
- bash -c "./configure $CONFIG_FLAGS"
39-
- mingw32-make -j3
39+
- mingw32-make
4040
- file lib/jemalloc.dll
41-
- mingw32-make -j3 tests
41+
- mingw32-make tests
4242
- mingw32-make -k check

‎.gitignore‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/*.gcov.*
2-
31
/bin/jemalloc-config
42
/bin/jemalloc.sh
53
/bin/jeprof
@@ -21,10 +19,14 @@
2119

2220
/Makefile
2321

24-
/include/jemalloc/internal/jemalloc_internal.h
22+
/include/jemalloc/internal/jemalloc_preamble.h
2523
/include/jemalloc/internal/jemalloc_internal_defs.h
24+
/include/jemalloc/internal/private_namespace.gen.h
2625
/include/jemalloc/internal/private_namespace.h
27-
/include/jemalloc/internal/private_unnamespace.h
26+
/include/jemalloc/internal/private_namespace_jet.gen.h
27+
/include/jemalloc/internal/private_namespace_jet.h
28+
/include/jemalloc/internal/private_symbols.awk
29+
/include/jemalloc/internal/private_symbols_jet.awk
2830
/include/jemalloc/internal/public_namespace.h
2931
/include/jemalloc/internal/public_symbols.txt
3032
/include/jemalloc/internal/public_unnamespace.h
@@ -40,8 +42,9 @@
4042
/include/jemalloc/jemalloc_typedefs.h
4143

4244
/src/*.[od]
43-
/src/*.gcda
44-
/src/*.gcno
45+
/src/*.sym
46+
47+
/run_tests.out/
4548

4649
/test/test.sh
4750
test/include/test/jemalloc_test.h
@@ -50,26 +53,23 @@ test/include/test/jemalloc_test_defs.h
5053
/test/integration/[A-Za-z]*
5154
!/test/integration/[A-Za-z]*.*
5255
/test/integration/*.[od]
53-
/test/integration/*.gcda
54-
/test/integration/*.gcno
5556
/test/integration/*.out
5657

58+
/test/integration/cpp/[A-Za-z]*
59+
!/test/integration/cpp/[A-Za-z]*.*
60+
/test/integration/cpp/*.[od]
61+
/test/integration/cpp/*.out
62+
5763
/test/src/*.[od]
58-
/test/src/*.gcda
59-
/test/src/*.gcno
6064

6165
/test/stress/[A-Za-z]*
6266
!/test/stress/[A-Za-z]*.*
6367
/test/stress/*.[od]
64-
/test/stress/*.gcda
65-
/test/stress/*.gcno
6668
/test/stress/*.out
6769

6870
/test/unit/[A-Za-z]*
6971
!/test/unit/[A-Za-z]*.*
7072
/test/unit/*.[od]
71-
/test/unit/*.gcda
72-
/test/unit/*.gcno
7373
/test/unit/*.out
7474

7575
/VERSION

‎.travis.yml‎

Lines changed: 89 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,90 +3,150 @@ language: generic
33
matrix:
44
include:
55
- os: linux
6-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS=""
6+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
77
- os: osx
8-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS=""
8+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
99
- os: linux
10-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS=""
10+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
1111
- os: linux
12-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS=""
12+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
1313
addons:
1414
apt:
1515
packages:
1616
- gcc-multilib
1717
- os: linux
18-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug"
18+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
1919
- os: linux
20-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof"
20+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2121
- os: linux
22-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats"
22+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2323
- os: linux
24-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-tcache"
24+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
25+
- os: linux
26+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
27+
- os: linux
28+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
29+
- os: linux
30+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2531
- os: osx
26-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS=""
32+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2733
- os: osx
28-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS=""
34+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
2935
- os: osx
30-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug"
36+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
3137
- os: osx
32-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats"
38+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
3339
- os: osx
34-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-tcache"
40+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
3541
- os: linux
36-
env: CC=clang COMPILER_FLAGS="-m32" CONFIGURE_FLAGS=""
42+
env: CC=clang CXX=clang++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
3743
addons:
3844
apt:
3945
packages:
4046
- gcc-multilib
4147
- os: linux
42-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug"
48+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
49+
- os: linux
50+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
51+
- os: linux
52+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
53+
- os: linux
54+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
55+
- os: linux
56+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
57+
- os: linux
58+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
59+
- os: linux
60+
env: CC=clang CXX=clang++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
4361
- os: linux
44-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof"
62+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-debug" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
63+
addons:
64+
apt:
65+
packages:
66+
- gcc-multilib
4567
- os: linux
46-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats"
68+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
69+
addons:
70+
apt:
71+
packages:
72+
- gcc-multilib
4773
- os: linux
48-
env: CC=clang COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-tcache"
74+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
75+
addons:
76+
apt:
77+
packages:
78+
- gcc-multilib
4979
- os: linux
50-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-debug"
80+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5181
addons:
5282
apt:
5383
packages:
5484
- gcc-multilib
5585
- os: linux
56-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--enable-prof"
86+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
5787
addons:
5888
apt:
5989
packages:
6090
- gcc-multilib
6191
- os: linux
62-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--disable-stats"
92+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
6393
addons:
6494
apt:
6595
packages:
6696
- gcc-multilib
6797
- os: linux
68-
env: CC=gcc COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--disable-tcache"
98+
env: CC=gcc CXX=g++ COMPILER_FLAGS="-m32" CONFIGURE_FLAGS="--with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
6999
addons:
70100
apt:
71101
packages:
72102
- gcc-multilib
73103
- os: linux
74-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --enable-prof"
104+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --enable-prof" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
105+
- os: linux
106+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
107+
- os: linux
108+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
109+
- os: linux
110+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
111+
- os: linux
112+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
113+
- os: linux
114+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
115+
- os: linux
116+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --disable-stats" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
117+
- os: linux
118+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
119+
- os: linux
120+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
121+
- os: linux
122+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
123+
- os: linux
124+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
125+
- os: linux
126+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=tcache:false" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
127+
- os: linux
128+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
129+
- os: linux
130+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
131+
- os: linux
132+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --with-malloc-conf=background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
133+
- os: linux
134+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false,dss:primary" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
75135
- os: linux
76-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-stats"
136+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false,percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
77137
- os: linux
78-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-debug --disable-tcache"
138+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=tcache:false,background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
79139
- os: linux
80-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --disable-stats"
140+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary,percpu_arena:percpu" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
81141
- os: linux
82-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--enable-prof --disable-tcache"
142+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=dss:primary,background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
83143
- os: linux
84-
env: CC=gcc COMPILER_FLAGS="" CONFIGURE_FLAGS="--disable-stats --disable-tcache"
144+
env: CC=gcc CXX=g++ COMPILER_FLAGS="" CONFIGURE_FLAGS="--with-malloc-conf=percpu_arena:percpu,background_thread:true" EXTRA_CFLAGS="-Werror -Wno-array-bounds"
85145

86146

87147
before_script:
88148
- autoconf
89-
- ./configure ${COMPILER_FLAGS:+ CC="$CC $COMPILER_FLAGS" } $CONFIGURE_FLAGS
149+
- ./configure ${COMPILER_FLAGS:+ CC="$CC $COMPILER_FLAGS" CXX="$CXX $COMPILER_FLAGS" } $CONFIGURE_FLAGS
90150
- make -j3
91151
- make -j3 tests
92152

‎COPYING‎

Lines changed: 2 additions & 2 deletions
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-2016 Jason Evans <[email protected]>.
4+
Copyright (C) 2002-2017 Jason Evans <[email protected]>.
55
All rights reserved.
66
Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
7-
Copyright (C) 2009-2016 Facebook, Inc. All rights reserved.
7+
Copyright (C) 2009-2017 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)