diff options
| author | Jason Evans <jasone@canonware.com> | 2016-03-26 17:30:37 -0700 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-04-11 02:15:42 -0700 |
| commit | c6a2c39404df9a3fb27735b93cf4cb3a76a2d4a7 (patch) | |
| tree | 9040078f332eefe1e4c1d9345094bc68208a57b3 /Makefile.in | |
| parent | 2ee2f1ec57d9094643db60210c28b989f2e7da83 (diff) | |
| download | jemalloc-c6a2c39404df9a3fb27735b93cf4cb3a76a2d4a7.tar.gz | |
Refactor/fix ph.
Refactor ph to support configurable comparison functions. Use a cpp
macro code generation form equivalent to the rb macros so that pairing
heaps can be used for both run heaps and chunk heaps.
Remove per node parent pointers, and instead use leftmost siblings' prev
pointers to track parents.
Fix multi-pass sibling merging to iterate over intermediate results
using a FIFO, rather than a LIFO. Use this fixed sibling merging
implementation for both merge phases of the auxiliary twopass algorithm
(first merging the aux list, then replacing the root with its merged
children). This fixes both degenerate merge behavior and the potential
for deep recursion.
This regression was introduced by
6bafa6678fc36483e638f1c3a0a9bf79fb89bfc9 (Pairing heap).
This resolves #371.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 7f2d668..480ce1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,7 +95,6 @@ C_SRCS := $(srcroot)src/jemalloc.c \ $(srcroot)src/mutex.c \ $(srcroot)src/nstime.c \ $(srcroot)src/pages.c \ - $(srcroot)src/ph.c \ $(srcroot)src/prng.c \ $(srcroot)src/prof.c \ $(srcroot)src/quarantine.c \ |