diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-15 15:36:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-15 15:36:02 +0200 |
| commit | 0476714af7f673de941225ed0daee1447935f248 (patch) | |
| tree | af91592c0a3d4cc9933e034db26ed8232ce9827e /erts/emulator/beam/beam_emu.c | |
| parent | d9cf4788018c511e844320b437e8baf4ef7380ce (diff) | |
| parent | f5138184479bd16c0ee0a5e583479378451401c8 (diff) | |
| download | otp-0476714af7f673de941225ed0daee1447935f248.tar.gz otp-0476714af7f673de941225ed0daee1447935f248.tar.bz2 otp-0476714af7f673de941225ed0daee1447935f248.zip | |
Merge branch 'hamt_bin2term'
* hamt_bin2term:
erts: Add erts_factory_trim_and_close
erts: Optimize driver_deliver_term
erts: Remove hashmap probabilistic heap overestimation
Conflicts:
erts/emulator/beam/beam_load.c
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index a21622f424..2d4bf4240c 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6653,8 +6653,9 @@ new_map(Process* p, Eterm* reg, BeamInstr* I) p->htop = mhp; - factory.p = p; + erts_factory_proc_init(&factory, p); res = erts_hashmap_from_array(&factory, thp, n/2, 0); + erts_factory_close(&factory); if (p->mbuf) { Uint live = Arg(2); reg[live] = res; |