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_nif.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_nif.c')
-rw-r--r-- | erts/emulator/beam/erl_nif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index e95d9c4f75..eadaf137e3 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -631,7 +631,7 @@ Eterm enif_make_binary(ErlNifEnv* env, ErlNifBinary* bin) pb->bytes = (byte*) bptr->orig_bytes; pb->flags = 0; - MSO(env->proc).overhead += pb->size / sizeof(Eterm); + OH_OVERHEAD(&(MSO(env->proc)), pb->size / sizeof(Eterm)); bin_term = make_binary(pb); if (erts_refc_read(&bptr->refc, 1) == 1) { /* Total ownership transfer */ |