Skip to content

Commit

Permalink
loading: add missing deadlock causing #45704
Browse files Browse the repository at this point in the history 
Does not explicitly close issue #45704, as perhaps the deserialized
module should still be valid after the replacement warning.

(cherry picked from commit ad8893b)
  • Loading branch information
@vtjnash
vtjnash authored and KristofferC committed Jul 4, 2022
1 parent a13e688 commit 8515cd0
Showing 1 changed file with 64 additions and 39 deletions.
103 changes: 64 additions & 39 deletions base/loading.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ function dummy_uuid(project_file::String)
end
project_path = try
realpath(project_file)
catch
catch ex
ex isa IOError || rethrow()
project_file
end
uuid = uuid5(ns_dummy_uuid, project_path)
Expand Down Expand Up @@ -335,15 +336,15 @@ function locate_package(pkg::PkgId)::Union{Nothing,String}
for env in load_path()
# look for the toplevel pkg `pkg.name` in this entry
found = project_deps_get(env, pkg.name)
found === nothing && continue
if pkg == found
# pkg.name is present in this directory or project file,
# return the path the entry point for the code, if it could be found
# otherwise, signal failure
return implicit_manifest_uuid_path(env, pkg)
if found !== nothing
@assert found.name == pkg.name
if found.uuid === nothing
# pkg.name is present in this directory or project file,
# return the path the entry point for the code, if it could be found
# otherwise, signal failure
return implicit_manifest_uuid_path(env, pkg)
end
end
@assert found.uuid !== nothing
return locate_package(found) # restart search now that we know the uuid for pkg
end
else
for env in load_path()
Expand Down Expand Up @@ -790,6 +791,7 @@ end
# or an Exception that describes why it couldn't be loaded
# and it reconnects the Base.Docs.META
function _include_from_serialized(pkg::PkgId, path::String, depmods::Vector{Any})
assert_havelock(require_lock)
sv = ccall(:jl_restore_incremental, Any, (Cstring, Any), path, depmods)
if isa(sv, Exception)
return sv
Expand Down Expand Up @@ -823,6 +825,7 @@ function _include_from_serialized(pkg::PkgId, path::String, depmods::Vector{Any}
end

function run_package_callbacks(modkey::PkgId)
assert_havelock(require_lock)
unlock(require_lock)
try
for callback in package_callbacks
Expand All @@ -839,34 +842,51 @@ function run_package_callbacks(modkey::PkgId)
end

function _tryrequire_from_serialized(modkey::PkgId, build_id::UInt64, modpath::Union{Nothing, String}, depth::Int = 0)
assert_havelock(require_lock)
local loaded = nothing
if root_module_exists(modkey)
M = root_module(modkey)
if PkgId(M) == modkey && module_build_id(M) === build_id
return M
loaded = M
end
else
if modpath === nothing
modpath = locate_package(modkey)
modpath === nothing && return nothing
loading = get(package_locks, modkey, false)
if loading !== false
# load already in progress for this module
return wait(loading)
end
mod = _require_search_from_serialized(modkey, String(modpath), depth)
get!(PkgOrigin, pkgorigins, modkey).path = modpath
if !isa(mod, Bool)
run_package_callbacks(modkey)
for M in mod::Vector{Any}
M = M::Module
if PkgId(M) == modkey && module_build_id(M) === build_id
return M
package_locks[modkey] = Threads.Condition(require_lock)
try
if modpath === nothing
modpath = locate_package(modkey)
modpath === nothing && return nothing
end
mod = _require_search_from_serialized(modkey, String(modpath), depth)
get!(PkgOrigin, pkgorigins, modkey).path = modpath
if !isa(mod, Bool)
for M in mod::Vector{Any}
M = M::Module
if PkgId(M) == modkey && module_build_id(M) === build_id
loaded = M
break
end
end
end
finally
loading = pop!(package_locks, modkey)
notify(loading, loaded, all=true)
end
if loaded !== nothing
run_package_callbacks(modkey)
end
end
return nothing
return loaded
end

function _require_from_serialized(pkg::PkgId, path::String)
# loads a precompile cache file, ignoring stale_cachfile tests
# load all of the dependent modules first
assert_havelock(require_lock)
local depmodnames
io = open(path, "r")
try
Expand Down Expand Up @@ -895,6 +915,7 @@ const TIMING_IMPORTS = Threads.Atomic{Int}(0)
# returns `false` if the module isn't known to be precompilable
# returns the set of modules restored if the cache load succeeded
@constprop :none function _require_search_from_serialized(pkg::PkgId, sourcepath::String, depth::Int = 0)
assert_havelock(require_lock)
timing_imports = TIMING_IMPORTS[] > 0
try
if timing_imports
Expand All @@ -911,7 +932,8 @@ const TIMING_IMPORTS = Threads.Atomic{Int}(0)
staledeps = staledeps::Vector{Any}
try
touch(path_to_try) # update timestamp of precompilation file
catch # file might be read-only and then we fail to update timestamp, which is fine
catch ex # file might be read-only and then we fail to update timestamp, which is fine
ex isa IOError || rethrow()
end
# finish loading module graph into staledeps
for i in 1:length(staledeps)
Expand All @@ -929,6 +951,7 @@ const TIMING_IMPORTS = Threads.Atomic{Int}(0)
if staledeps === true
continue
end
#@debug "Loading cache file $path for $pkg at $sourcepath"
restored = _include_from_serialized(pkg, path_to_try, staledeps)
if isa(restored, Exception)
@debug "Deserialization checks failed while attempting to load cache from $path_to_try" exception=restored
Expand Down Expand Up @@ -1107,18 +1130,19 @@ const pkgorigins = Dict{PkgId,PkgOrigin}()
require(uuidkey::PkgId) = @lock require_lock _require_prelocked(uuidkey)

function _require_prelocked(uuidkey::PkgId)
just_loaded_pkg = false
assert_havelock(require_lock)
if !root_module_exists(uuidkey)
_require(uuidkey)
newm = _require(uuidkey)
if newm === nothing
error("package `$(uuidkey.name)` did not define the expected \
module `$(uuidkey.name)`, check for typos in package module name")
end
# After successfully loading, notify downstream consumers
run_package_callbacks(uuidkey)
just_loaded_pkg = true
end
if just_loaded_pkg && !root_module_exists(uuidkey)
error("package `$(uuidkey.name)` did not define the expected \
module `$(uuidkey.name)`, check for typos in package module name")
else
newm = root_module(uuidkey)
end
return root_module(uuidkey)
return newm
end

const loaded_modules = Dict{PkgId,Module}()
Expand Down Expand Up @@ -1191,18 +1215,19 @@ function set_pkgorigin_version_path(pkg, path)
pkgorigin.path = path
end

# Returns `nothing` or the name of the newly-created cachefile
# Returns `nothing` or the new(ish) module
function _require(pkg::PkgId)
assert_havelock(require_lock)
# handle recursive calls to require
loading = get(package_locks, pkg, false)
if loading !== false
# load already in progress for this module
wait(loading)
return
return wait(loading)
end
package_locks[pkg] = Threads.Condition(require_lock)

last = toplevel_load[]
loaded = nothing
try
toplevel_load[] = false
# perform the search operation to select the module file require intends to load
Expand All @@ -1219,7 +1244,7 @@ function _require(pkg::PkgId)
if JLOptions().use_compiled_modules != 0
m = _require_search_from_serialized(pkg, path)
if !isa(m, Bool)
return
return m
end
end

Expand Down Expand Up @@ -1254,7 +1279,7 @@ function _require(pkg::PkgId)
if isa(m, Exception)
@warn "The call to compilecache failed to create a usable precompiled cache file for $pkg" exception=m
else
return
return m
end
end
end
Expand All @@ -1271,7 +1296,7 @@ function _require(pkg::PkgId)
unlock(require_lock)
try
include(__toplevel__, path)
return
loaded = get(loaded_modules, key, nothing)
finally
lock(require_lock)
if uuid !== old_uuid
Expand All @@ -1281,9 +1306,9 @@ function _require(pkg::PkgId)
finally
toplevel_load[] = last
loading = pop!(package_locks, pkg)
notify(loading, all=true)
notify(loading, loaded, all=true)
end
nothing
return loaded
end

# relative-path load
Expand Down

0 comments on commit 8515cd0

Please sign in to comment.