aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erts_code_purger.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-12-15 20:32:39 +0100
committerSverker Eriksson <[email protected]>2016-01-13 19:59:53 +0100
commitfa44f865c3fc6253cf4691cf94839c303a3ee40f (patch)
tree47ec77902253825bceab86035a6c960b801188e2 /erts/preloaded/src/erts_code_purger.erl
parentc612edf4ada1f00b2bdb8404103e0d8307dc8f4c (diff)
downloadotp-fa44f865c3fc6253cf4691cf94839c303a3ee40f.tar.gz
otp-fa44f865c3fc6253cf4691cf94839c303a3ee40f.tar.bz2
otp-fa44f865c3fc6253cf4691cf94839c303a3ee40f.zip
erts: Make erlang:purge_module/1 safe
Problem: erlang:purge_module/1 is not safe in the sense that very bad things may happen if the code to be purged is still referred to by live processes. Introduce erts_internal:purge_module which is the same as the old erlang:purge_module BIF (except it returns false if no such old module). Implement erlang:purge_module in Erlang and let it invoke erts_code_purger for safe purging where all clogging processes first are killed.
Diffstat (limited to 'erts/preloaded/src/erts_code_purger.erl')
-rw-r--r--erts/preloaded/src/erts_code_purger.erl14
1 files changed, 3 insertions, 11 deletions
diff --git a/erts/preloaded/src/erts_code_purger.erl b/erts/preloaded/src/erts_code_purger.erl
index 6bb6e4fcdc..880c86aad1 100644
--- a/erts/preloaded/src/erts_code_purger.erl
+++ b/erts/preloaded/src/erts_code_purger.erl
@@ -70,12 +70,8 @@ do_purge(Mod) ->
true = erlang:copy_literals(Mod, true),
DidKill = check_proc_code(erlang:processes(), Mod, true),
true = erlang:copy_literals(Mod, false),
- try
- erlang:purge_module(Mod)
- catch
- _:_ -> ignore
- end,
- {true, DidKill}
+ WasPurged = erts_internal:purge_module(Mod),
+ {WasPurged, DidKill}
end.
%% soft_purge(Module)
@@ -104,11 +100,7 @@ do_soft_purge(Mod) ->
false;
true ->
true = erlang:copy_literals(Mod, false),
- try
- erlang:purge_module(Mod)
- catch
- _:_ -> ignore
- end,
+ erts_internal:purge_module(Mod),
true
end
end.