Skip to content

fix(device): reload stale persistent resolved-device entries #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xylophonez wants to merge 1 commit into
base: edge
Choose a base branch
from
Open

fix(device): reload stale persistent resolved-device entries #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/core/device/hb_device_load.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,29 @@ get_resolved_device(Ref, Opts) ->
store_key(Ref),
Opts
),
Mod = hb_util:atom(Bin),
{ok, Mod} ?= loaded_cached_module(Bin),
% We always stash in the process dictionary, despite the fact
% the reference was already in the global store.
erlang:put({?MODULE, Ref}, Mod),
{cached, Mod}
end
end.

%% @doc A persistent cache entry names a module; it does not persist the BEAM
%% code loaded into the previous VM. Treat names absent from this VM's atom
%% table, or modules whose code is not loaded, as cache misses so the trusted
%% archive path can load them again.
loaded_cached_module(Bin) ->
try hb_util:atom(Bin) of
Mod ->
case code:is_loaded(Mod) of
false -> {error, not_found};
_ -> {ok, Mod}
end
catch
error:badarg -> {error, not_found}
end.

%% @doc Memoise a resolved device in the process dictionary and the
%% shared `loaded-device-store'.
put_resolved_device(Ref, Mod, Opts) ->
Expand Down Expand Up @@ -412,3 +427,12 @@ compatible(Msg, Opts) ->
[] -> ok;
_ -> {error, {failed_requirements, Failed}}
end.

persistent_cache_requires_loaded_code_test() ->
?assertEqual({ok, ?MODULE}, loaded_cached_module(atom_to_binary(?MODULE))),
?assertEqual(
{error, not_found},
loaded_cached_module(
<<"_hb_device_stale_cache_entry_that_is_not_an_existing_atom">>
)
).