diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-27 14:16:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-27 14:16:34 +0200 |
| commit | e402b08254ee9a78a2560e3123e1fb468fa948dc (patch) | |
| tree | 0643077532cd0d91ac8b0b23a1cc26b0093f780b | |
| parent | c49194c9239c0dcad17b902b6638edf53bb69c6c (diff) | |
| parent | ce0785da10fb5d82ed3b6e93ff82e112f38e75fa (diff) | |
| download | otp-e402b08254ee9a78a2560e3123e1fb468fa948dc.tar.gz otp-e402b08254ee9a78a2560e3123e1fb468fa948dc.tar.bz2 otp-e402b08254ee9a78a2560e3123e1fb468fa948dc.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/beam_load.h | 3 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_fun.c | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 099abad4e1..e7301b1b4b 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -1397,10 +1397,10 @@ erts_purge_state_add_fun(ErlFunEntry *fe) } Export * -erts_suspend_process_on_pending_purge_lambda(Process *c_p) +erts_suspend_process_on_pending_purge_lambda(Process *c_p, ErlFunEntry* fe) { erts_smp_mtx_lock(&purge_state.mtx); - if (is_value(purge_state.module)) { + if (purge_state.module == fe->module) { /* * The process c_p is about to call a fun in the code * that we are trying to purge. Suspend it and call diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 84e2d42af6..7eaa7a0d8b 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6547,7 +6547,7 @@ call_fun(Process* p, /* Current process. */ * and let it try again when the purge operation is * done (may succeed or not). */ - ep = erts_suspend_process_on_pending_purge_lambda(p); + ep = erts_suspend_process_on_pending_purge_lambda(p, fe); ASSERT(ep); } else { diff --git a/erts/emulator/beam/beam_load.h b/erts/emulator/beam/beam_load.h index 6a3110d0f5..d420a4346c 100644 --- a/erts/emulator/beam/beam_load.h +++ b/erts/emulator/beam/beam_load.h @@ -116,7 +116,8 @@ int erts_is_module_native(BeamCodeHeader* code); void erts_beam_bif_load_init(void); struct erl_fun_entry; void erts_purge_state_add_fun(struct erl_fun_entry *fe); -Export *erts_suspend_process_on_pending_purge_lambda(Process *c_p); +Export *erts_suspend_process_on_pending_purge_lambda(Process *c_p, + struct erl_fun_entry*); /* * Layout of the line table. diff --git a/erts/emulator/beam/erl_fun.c b/erts/emulator/beam/erl_fun.c index 9deec946d5..acb0d609d0 100644 --- a/erts/emulator/beam/erl_fun.c +++ b/erts/emulator/beam/erl_fun.c @@ -236,7 +236,6 @@ erts_fun_purge_abort_prepare(ErlFunEntry **funs, Uint no) ErlFunEntry *fe = funs[ix]; if (fe->address == unloaded_fun) fe->address = fe->pend_purge_address; - fe->pend_purge_address = NULL; } } |