Skip to content

Fix thread local cache management #2

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

Merged
merged 2 commits into from
May 8, 2023
Merged

Fix thread local cache management #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b61142
Use `maxthreadid` instead of `nthreads` for caches
kpamnany May 5, 2023
897dad6
Fix thread local cache emptying for both threadpools
kpamnany May 5, 2023
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
7 changes: 7 additions & 0 deletions src/types/timezone.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ const THREAD_TZ_CACHES = Vector{Dict{String,Tuple{TimeZone,Class}}}()
end
@noinline _tz_cache_length_assert() = @assert false "0 < tid <= length(THREAD_TZ_CACHES)"

@static if VERSION >= v"1.9.0"
function _reset_tz_cache()
# ensures that we didn't save a bad object
resize!(empty!(THREAD_TZ_CACHES), Threads.maxthreadid())
end
else # prior to 1.9.0
function _reset_tz_cache()
# ensures that we didn't save a bad object
resize!(empty!(THREAD_TZ_CACHES), Threads.nthreads())
end
end

"""
TimeZone(str::AbstractString) -> TimeZone
Expand Down
32 changes: 26 additions & 6 deletions src/tzdata/compile.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,18 +689,38 @@ function compile(tz_source::TZSource; kwargs...)
return results
end

@static if VERSION >= v"1.9.0"
# As the caches are thread local, we must spawn a task on every thread to
# empty that thread's cache.
function empty_thread_local_caches(both_pools = true)
tp = Threads.threadpool()
Threads.@threads :static for i in 1:Threads.nthreads(tp)
empty!(_tz_cache())
end
!both_pools && return
if tp == :default
if Threads.nthreads(:interactive) > 0
fetch(Threads.@spawn :interactive empty_thread_local_caches(false))
end
else
fetch(Threads.@spawn :default empty_thread_local_caches(false))
end
end
else # prior to 1.9.0
function empty_thread_local_caches(both_pools = true)
Threads.@threads :static for i in 1:Threads.nthreads()
empty!(_tz_cache())
end
end
end

function compile(tz_source::TZSource, dest_dir::AbstractString; kwargs...)
results = compile(tz_source; kwargs...)

isdir(dest_dir) || error("Destination directory doesn't exist")
# When we recompile the TimeZones from a new source, we clear all the existing cached
# TimeZone objects, so that newly constructed objects pick up the newly compiled rules.
# Since we use thread-local caches, we spawn a task on _each thread_ to clear that
# thread's local cache.
Threads.@threads :static for i in 1:Threads.nthreads()
@assert Threads.threadid() === i "TimeZones.TZData.compile() must be called from the main, top-level Task."
empty!(_tz_cache())
end
empty_thread_local_caches()

for (tz, class) in results
parts = split(TimeZones.name(tz), '/')
Expand Down