diff options
| author | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-06 18:18:30 +0100 |
| commit | 888c889714569a142525505c914f577135a46ec9 (patch) | |
| tree | 5d7e01b55e85b7a020d8e4529c3a2e863f5f97f5 /erts/emulator/beam/erl_gc.c | |
| parent | 716406856f6c5681b210ddf1908d398a08f55168 (diff) | |
| parent | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (diff) | |
| download | otp-888c889714569a142525505c914f577135a46ec9.tar.gz otp-888c889714569a142525505c914f577135a46ec9.tar.bz2 otp-888c889714569a142525505c914f577135a46ec9.zip | |
Merge branch 'maint'
* maint:
Atomic reference count of binaries also in non-SMP
Conflicts:
erts/emulator/beam/erl_fun.c
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 3a3ad820b5..897dbbe82b 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -2857,7 +2857,7 @@ sweep_off_heap(Process *p, int fullsweep) case FUN_SUBTAG: { ErlFunEntry* fe = ((ErlFunThing*)ptr)->fe; - if (erts_refc_dectest(&fe->refc, 0) == 0) { + if (erts_smp_refc_dectest(&fe->refc, 0) == 0) { erts_erase_fun_entry(fe); } break; @@ -3519,12 +3519,12 @@ erts_check_off_heap2(Process *p, Eterm *htop) refc = erts_refc_read(&u.pb->val->refc, 1); break; case FUN_SUBTAG: - refc = erts_refc_read(&u.fun->fe->refc, 1); + refc = erts_smp_refc_read(&u.fun->fe->refc, 1); break; case EXTERNAL_PID_SUBTAG: case EXTERNAL_PORT_SUBTAG: case EXTERNAL_REF_SUBTAG: - refc = erts_refc_read(&u.ext->node->refc, 1); + refc = erts_smp_refc_read(&u.ext->node->refc, 1); break; default: ASSERT(!"erts_check_off_heap2: Invalid thing_word"); |