aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-09-14 13:33:03 +0200
committerErlang/OTP <[email protected]>2016-09-14 13:33:03 +0200
commit528b9b8d22b20bfcfaf40a637e36f38628f62fd1 (patch)
treee2dba45836e868199008c699e225f31a0237eeee /erts
parent226a754d1f4babb262b2a15569b174921f97ad86 (diff)
parent25ea6279b55db5af53040ec4ce9bf73b4aeeaa16 (diff)
downloadotp-528b9b8d22b20bfcfaf40a637e36f38628f62fd1.tar.gz
otp-528b9b8d22b20bfcfaf40a637e36f38628f62fd1.tar.bz2
otp-528b9b8d22b20bfcfaf40a637e36f38628f62fd1.zip
Merge branch 'rickard/gc-msgq-bin-fix/OTP-13890' into maint-19
* rickard/gc-msgq-bin-fix/OTP-13890: Ensure we dont use an invalid live heap fragment pointer Update vheap size when moving msgq to heap after GC
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_gc.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 9e0919cc9c..027ade45e5 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -150,6 +150,7 @@ static void move_msgq_to_heap(Process *p);
static int reached_max_heap_size(Process *p, Uint total_heap_size,
Uint extra_heap_size, Uint extra_old_heap_size);
static void init_gc_info(ErtsGCInfo *gcip);
+static Uint64 next_vheap_size(Process* p, Uint64 vheap, Uint64 vheap_sz);
#ifdef HARDDEBUG
static void disallow_heap_frag_ref_in_heap(Process* p);
@@ -387,6 +388,11 @@ erts_gc_after_bif_call_lhf(Process* p, ErlHeapFragment *live_hf_end,
return result;
}
+ if (!p->mbuf) {
+ /* Must have GC:d in BIF call... invalidate live_hf_end */
+ live_hf_end = ERTS_INVALID_HFRAG_PTR;
+ }
+
if (is_non_value(result)) {
if (p->freason == TRAP) {
#if HIPE
@@ -748,6 +754,9 @@ do_major_collection:
p->last_old_htop = p->old_htop;
#endif
+ ASSERT(!p->mbuf);
+ ASSERT(!ERTS_IS_GC_DESIRED(p));
+
return reds;
}
@@ -2250,7 +2259,9 @@ copy_one_frag(Eterm** hpp, ErlOffHeap* off_heap,
static void
move_msgq_to_heap(Process *p)
{
+
ErtsMessage **mpp = &p->msg.first;
+ Uint64 pre_oh = MSO(p).overhead;
while (*mpp) {
ErtsMessage *mp = *mpp;
@@ -2293,6 +2304,11 @@ move_msgq_to_heap(Process *p)
mpp = &(*mpp)->next;
}
+
+ if (pre_oh != MSO(p).overhead) {
+ /* Got new binaries; update vheap size... */
+ BIN_VHEAP_SZ(p) = next_vheap_size(p, MSO(p).overhead, BIN_VHEAP_SZ(p));
+ }
}
static Uint