Skip to content

release-1.7 Revert "Make write_env_usage atomic (#2661)" #2731

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
KristofferC merged 2 commits into from
Sep 16, 2021
Merged

release-1.7 Revert "Make write_env_usage atomic (#2661)" #2731

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
637801b
Revert "Make `write_env_usage` atomic (#2661)"
KristofferC Sep 16, 2021
e0a5f21
test on 1.7
KristofferC Sep 16, 2021
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
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:
- ""
- "pkg.julialang.org"
julia-version:
# - '1.6'
- 'nightly'
- "^1.7.0-0"
exclude:
- os: macOS-latest
julia-arch: x86
Expand Down
51 changes: 8 additions & 43 deletions src/Types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,50 +464,15 @@ function write_env_usage(source_file::AbstractString, usage_filepath::AbstractSt
# Ensure that log dir exists
!ispath(logdir()) && mkpath(logdir())

usage_file = joinpath(logdir(), usage_filepath)
timestamp = now()

## Atomically write usage file
while true
# read existing usage file
usage = if isfile(usage_file)
TOML.parsefile(usage_file)
else
Dict{String, Any}()
end

# record new usage
usage[source_file] = [Dict("time" => timestamp)]

# keep only latest usage info
for k in keys(usage)
times = map(d -> Dates.DateTime(d["time"]), usage[k])
usage[k] = [Dict("time" => maximum(times))]
end

# Write to a temp file in the same directory as the destination
temp_usage_file = tempname(logdir())
open(temp_usage_file, "w") do io
TOML.print(io, usage, sorted=true)
end

# Move the temp file into place, replacing the original
mv(temp_usage_file, usage_file, force = true)
# Generate entire entry as a string first
entry = sprint() do io
TOML.print(io, Dict(source_file => [Dict("time" => now())]))
end

# Check that the new file has what we want in it
new_usage = if isfile(usage_file)
TOML.parsefile(usage_file)
else
Dict{String, Any}()
end
if haskey(new_usage, source_file)
for e in new_usage[source_file]
if Dates.DateTime(e["time"]) >= timestamp
return
end
end
end
# If not, try again
# Append entry to log file in one chunk
usage_file = joinpath(logdir(), usage_filepath)
open(usage_file, append=true) do io
write(io, entry)
end
end

Expand Down