diff options
| author | Patrik Nyblom <[email protected]> | 2010-08-30 14:21:49 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-08-30 14:21:49 +0200 |
| commit | be798f416bcab08df788101be486e8f33cd62320 (patch) | |
| tree | 77b699ed254187b5facb6baaf396c05f951c0a24 /erts/emulator/beam/erl_message.c | |
| parent | 5b91c9f8e79f0e8eb0a5816fd54c5603f1c6df29 (diff) | |
| parent | 7664e3ac07f51522b464e550e6012056d4ab45d5 (diff) | |
| download | otp-be798f416bcab08df788101be486e8f33cd62320.tar.gz otp-be798f416bcab08df788101be486e8f33cd62320.tar.bz2 otp-be798f416bcab08df788101be486e8f33cd62320.zip | |
Merge branch 'egil/R14A/binary-gc-wrap/OTP-8730' into dev
* egil/R14A/binary-gc-wrap/OTP-8730:
Increase vheap counter to Uint64
Fix wrapping in next vheap calculation
Diffstat (limited to 'erts/emulator/beam/erl_message.c')
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 1f61dca230..82f272d28a 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -220,7 +220,7 @@ link_mbuf_to_proc(Process *proc, ErlHeapFragment *bp) *next_p = MSO(proc).first; MSO(proc).first = bp->off_heap.first; bp->off_heap.first = NULL; - MSO(proc).overhead += bp->off_heap.overhead; + OH_OVERHEAD(&(MSO(proc)), bp->off_heap.overhead); } } } @@ -535,7 +535,7 @@ erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg) goto copy_done; } - off_heap->overhead += bp->off_heap.overhead; + OH_OVERHEAD(off_heap, bp->off_heap.overhead); sz = bp->used_size; ASSERT(is_immed(term) || in_heapfrag(ptr_val(term),bp)); |