diff options
| author | Rickard Green <[email protected]> | 2017-01-17 12:31:33 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-17 12:31:33 +0100 |
| commit | 968b6b656abd90a8f9d7bc058bce255a57502fc7 (patch) | |
| tree | 7b5053917c9e512541a1e86808709168e1ebcd9b /erts/emulator/beam/erl_gc.c | |
| parent | 268fa11bc6904809643a4f99cb6f7c35edabf5dd (diff) | |
| parent | 6db6cd94682d05eddbfa8b712419e70576d20846 (diff) | |
| download | otp-968b6b656abd90a8f9d7bc058bce255a57502fc7.tar.gz otp-968b6b656abd90a8f9d7bc058bce255a57502fc7.tar.bz2 otp-968b6b656abd90a8f9d7bc058bce255a57502fc7.zip | |
Merge branch 'maint'
* maint:
Fix memory leak of temporary heap
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 643b46c861..a21524c5a4 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -110,7 +110,6 @@ typedef struct { static Uint setup_rootset(Process*, Eterm*, int, Rootset*); static void cleanup_rootset(Rootset *rootset); -static void deallocate_previous_young_generation(Process *c_p); static Eterm *full_sweep_heaps(Process *p, int hibernate, Eterm *n_heap, Eterm* n_htop, @@ -862,7 +861,7 @@ erts_garbage_collect_hibernate(Process* p) disallow_heap_frag_ref_in_heap(p, heap, htop); #endif - deallocate_previous_young_generation(p); + erts_deallocate_young_generation(p); p->heap = heap; p->high_water = htop; @@ -1519,7 +1518,7 @@ do_minor(Process *p, ErlHeapFragment *live_hf_end, disallow_heap_frag_ref_in_heap(p, n_heap, n_htop); #endif - deallocate_previous_young_generation(p); + erts_deallocate_young_generation(p); HEAP_START(p) = n_heap; HEAP_TOP(p) = n_htop; @@ -1617,7 +1616,7 @@ major_collection(Process* p, ErlHeapFragment *live_hf_end, disallow_heap_frag_ref_in_heap(p, n_heap, n_htop); #endif - deallocate_previous_young_generation(p); + erts_deallocate_young_generation(p); HEAP_START(p) = n_heap; HEAP_TOP(p) = n_htop; @@ -1779,8 +1778,8 @@ adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj) return adjusted; } -static void -deallocate_previous_young_generation(Process *c_p) +void +erts_deallocate_young_generation(Process *c_p) { Eterm *orig_heap; |