Merge branch 'josevalim/fix-code-server-deadlock/PR-8744/OTP-19305' i…

…nto maint OTP-19305 * josevalim/fix-code-server-deadlock/PR-8744/OTP-19305: Refactor code server to use a single queue
erlang · Oct 25, 2024 · 75d1c4e · 75d1c4e
2 parents 82ed78d + 72f2c90
commit 75d1c4e
Show file tree

Hide file tree

Showing 3 changed files with 283 additions and 198 deletions.
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
@@ -563,9 +563,10 @@ ensure_loaded(Mod) when is_atom(Mod) ->
                         {Binary,File,Ref} ->
                             case ensure_prepare_loading(Mod, Binary, File) of
                                 {error,_}=Error ->
-                                    call({load_error, Ref, Mod, Error});
+                                    call({load_error, Mod, Ref}),
+                                    Error;
                                 Prepared ->
-                                    call({load_module, Prepared, Mod, File, false, Ref})
+                                    call({load_ok, Prepared, Mod, File, Ref})
                             end
                     end;
                 embedded ->