@@ -78,15 +78,32 @@ LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
7878# Lists of files.
7979BINS := $(objroot ) bin/jemalloc-config $(objroot ) bin/jemalloc.sh $(objroot ) bin/jeprof
8080C_HDRS := $(objroot ) include/jemalloc/jemalloc$(install_suffix ) .h
81- C_SRCS := $(srcroot ) src/jemalloc.c $(srcroot ) src/arena.c \
82- $(srcroot ) src/atomic.c $(srcroot ) src/base.c $(srcroot ) src/bitmap.c \
83- $(srcroot ) src/chunk.c $(srcroot ) src/chunk_dss.c \
84- $(srcroot ) src/chunk_mmap.c $(srcroot ) src/ckh.c $(srcroot ) src/ctl.c \
85- $(srcroot ) src/extent.c $(srcroot ) src/hash.c $(srcroot ) src/huge.c \
86- $(srcroot ) src/mb.c $(srcroot ) src/mutex.c $(srcroot ) src/pages.c \
87- $(srcroot ) src/prof.c $(srcroot ) src/quarantine.c $(srcroot ) src/rtree.c \
88- $(srcroot ) src/stats.c $(srcroot ) src/tcache.c $(srcroot ) src/util.c \
89- $(srcroot ) src/tsd.c
81+ C_SRCS := $(srcroot ) src/jemalloc.c \
82+ $(srcroot ) src/arena.c \
83+ $(srcroot ) src/atomic.c \
84+ $(srcroot ) src/base.c \
85+ $(srcroot ) src/bitmap.c \
86+ $(srcroot ) src/chunk.c \
87+ $(srcroot ) src/chunk_dss.c \
88+ $(srcroot ) src/chunk_mmap.c \
89+ $(srcroot ) src/ckh.c \
90+ $(srcroot ) src/ctl.c \
91+ $(srcroot ) src/extent.c \
92+ $(srcroot ) src/hash.c \
93+ $(srcroot ) src/huge.c \
94+ $(srcroot ) src/mb.c \
95+ $(srcroot ) src/mutex.c \
96+ $(srcroot ) src/nstime.c \
97+ $(srcroot ) src/pages.c \
98+ $(srcroot ) src/prng.c \
99+ $(srcroot ) src/prof.c \
100+ $(srcroot ) src/quarantine.c \
101+ $(srcroot ) src/rtree.c \
102+ $(srcroot ) src/stats.c \
103+ $(srcroot ) src/tcache.c \
104+ $(srcroot ) src/ticker.c \
105+ $(srcroot ) src/tsd.c \
106+ $(srcroot ) src/util.c
90107ifeq ($(enable_valgrind ) , 1)
91108C_SRCS += $(srcroot ) src/valgrind.c
92109endif
@@ -116,10 +133,11 @@ C_TESTLIB_SRCS := $(srcroot)test/src/btalloc.c $(srcroot)test/src/btalloc_0.c \
116133 $(srcroot ) test/src/mtx.c $(srcroot ) test/src/mq.c \
117134 $(srcroot ) test/src/SFMT.c $(srcroot ) test/src/test.c \
118135 $(srcroot ) test/src/thd.c $(srcroot ) test/src/timer.c
119- C_UTIL_INTEGRATION_SRCS := $(srcroot ) src/util.c
136+ C_UTIL_INTEGRATION_SRCS := $(srcroot ) src/nstime.c $( srcroot ) src/ util.c
120137TESTS_UNIT := $(srcroot ) test/unit/atomic.c \
121138 $(srcroot ) test/unit/bitmap.c \
122139 $(srcroot ) test/unit/ckh.c \
140+ $(srcroot ) test/unit/decay.c \
123141 $(srcroot ) test/unit/hash.c \
124142 $(srcroot ) test/unit/junk.c \
125143 $(srcroot ) test/unit/junk_alloc.c \
@@ -129,6 +147,7 @@ TESTS_UNIT := $(srcroot)test/unit/atomic.c \
129147 $(srcroot ) test/unit/math.c \
130148 $(srcroot ) test/unit/mq.c \
131149 $(srcroot ) test/unit/mtx.c \
150+ $(srcroot ) test/unit/prng.c \
132151 $(srcroot ) test/unit/prof_accum.c \
133152 $(srcroot ) test/unit/prof_active.c \
134153 $(srcroot ) test/unit/prof_gdump.c \
@@ -140,9 +159,13 @@ TESTS_UNIT := $(srcroot)test/unit/atomic.c \
140159 $(srcroot ) test/unit/quarantine.c \
141160 $(srcroot ) test/unit/rb.c \
142161 $(srcroot ) test/unit/rtree.c \
162+ $(srcroot ) test/unit/run_quantize.c \
143163 $(srcroot ) test/unit/SFMT.c \
144164 $(srcroot ) test/unit/size_classes.c \
165+ $(srcroot ) test/unit/smoothstep.c \
145166 $(srcroot ) test/unit/stats.c \
167+ $(srcroot ) test/unit/ticker.c \
168+ $(srcroot ) test/unit/nstime.c \
146169 $(srcroot ) test/unit/tsd.c \
147170 $(srcroot ) test/unit/util.c \
148171 $(srcroot ) test/unit/zero.c
@@ -349,18 +372,22 @@ stress_dir:
349372check_dir : check_unit_dir check_integration_dir
350373
351374check_unit : tests_unit check_unit_dir
352- $(SHELL ) $(objroot ) test/test.sh $(TESTS_UNIT:$(srcroot ) %.c=$(objroot ) % )
375+ $(MALLOC_CONF ) =" purge:ratio" $(SHELL ) $(objroot ) test/test.sh $(TESTS_UNIT:$(srcroot ) %.c=$(objroot ) % )
376+ $(MALLOC_CONF ) =" purge:decay" $(SHELL ) $(objroot ) test/test.sh $(TESTS_UNIT:$(srcroot ) %.c=$(objroot ) % )
353377check_integration_prof : tests_integration check_integration_dir
354378ifeq ($(enable_prof ) , 1)
355379 $(MALLOC_CONF)="prof:true" $(SHELL) $(objroot)test/test.sh $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%)
356380 $(MALLOC_CONF)="prof:true,prof_active:false" $(SHELL) $(objroot)test/test.sh $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%)
357381endif
382+ check_integration_decay : tests_integration check_integration_dir
383+ $(MALLOC_CONF ) =" purge:decay,decay_time:-1" $(SHELL ) $(objroot ) test/test.sh $(TESTS_INTEGRATION:$(srcroot ) %.c=$(objroot ) % )
384+ $(MALLOC_CONF ) =" purge:decay,decay_time:0" $(SHELL ) $(objroot ) test/test.sh $(TESTS_INTEGRATION:$(srcroot ) %.c=$(objroot ) % )
385+ $(MALLOC_CONF ) =" purge:decay" $(SHELL ) $(objroot ) test/test.sh $(TESTS_INTEGRATION:$(srcroot ) %.c=$(objroot ) % )
358386check_integration : tests_integration check_integration_dir
359387 $(SHELL ) $(objroot ) test/test.sh $(TESTS_INTEGRATION:$(srcroot ) %.c=$(objroot ) % )
360388stress : tests_stress stress_dir
361389 $(SHELL ) $(objroot ) test/test.sh $(TESTS_STRESS:$(srcroot ) %.c=$(objroot ) % )
362- check : tests check_dir check_integration_prof
363- $(SHELL ) $(objroot ) test/test.sh $(TESTS_UNIT:$(srcroot ) %.c=$(objroot ) % ) $(TESTS_INTEGRATION:$(srcroot ) %.c=$(objroot ) % )
390+ check : check_unit check_integration check_integration_decay check_integration_prof
364391
365392ifeq ($(enable_code_coverage ) , 1)
366393coverage_unit : check_unit
0 commit comments