aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/src
diff options
context:
space:
mode:
authorPéter Gömöri <[email protected]>2015-05-29 19:00:33 +0200
committerBjörn Gustavsson <[email protected]>2015-06-10 11:44:33 +0200
commitb1012c31f38810c6754dcd4cf03f8d2bfb010506 (patch)
tree69c72ec0d08163565471a7cb86f567fa3c2259f7 /lib/tools/src
parent23501295ea5289897a75cb52a23685f8e6fcf18c (diff)
downloadotp-b1012c31f38810c6754dcd4cf03f8d2bfb010506.tar.gz
otp-b1012c31f38810c6754dcd4cf03f8d2bfb010506.tar.bz2
otp-b1012c31f38810c6754dcd4cf03f8d2bfb010506.zip
cover: handle undefined module when analysing to file
It is possible that not just the source but even the beam of a module is not available when calling analyse_to_file. For example when coverdata is imported from an old file and since then a module was removed. Before this fix cover:analyse_to_file/3 could possibly never return because of a helper process crashed with error:undef and never reply to the caller. At the same time link the helper process to cover_server so any further error won't let the caller waiting indefinitely.
Diffstat (limited to 'lib/tools/src')
-rw-r--r--lib/tools/src/cover.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 71e17e0ba1..24881a0ab0 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -782,7 +782,7 @@ main_process_loop(State) ->
{From, {{analyse_to_file, Opts},Module}} ->
S = try
Loaded = is_loaded(Module, State),
- spawn(fun() ->
+ spawn_link(fun() ->
?SPAWN_DBG(analyse_to_file,{Module,Opts}),
do_parallel_analysis_to_file(
Module, Opts, Loaded, From, State)
@@ -2143,7 +2143,13 @@ find_source(Module, File0) ->
throw_file(filename:join([BeamDir, "..", "src", Base])),
%% Not in ../src: look for source path in compile info, but
%% first look relative the beam directory.
- Info = lists:keyfind(source, 1, Module:module_info(compile)),
+ Info =
+ try lists:keyfind(source, 1, Module:module_info(compile))
+ catch error:undef ->
+ %% The module might have been imported
+ %% and the beam not available
+ throw({beam, File0})
+ end,
false == Info andalso throw({beam, File0}), %% stripped
{source, SrcFile} = Info,
throw_file(splice(BeamDir, SrcFile)), %% below ../src