convert write_env_usage to use a pidfile lock

Author: IanButterworth

src/Types.jl

@@ -15,6 +15,7 @@ import ..Pkg, ..Registry
 import ..Pkg: GitTools, depots, depots1, logdir, set_readonly, safe_realpath, pkg_server, stdlib_dir, stdlib_path, isurl, stderr_f
 import Base.BinaryPlatforms: Platform
 using ..Pkg.Versions
+import ..Pkg.Pidfile
 
 import Base: SHA1
 using SHA
@@ -466,9 +467,8 @@ function write_env_usage(source_file::AbstractString, usage_filepath::AbstractSt
     usage_file = joinpath(logdir(), usage_filepath)
     timestamp = now()
 
-    ## Atomically write usage file
-    while true
-        # read existing usage file
+    ## Atomically write usage file using process id locking
+    Pidfile.mkpidlock(usage_file * ".pidlock") do
         usage = if isfile(usage_file)
             TOML.parsefile(usage_file)
         else
@@ -484,30 +484,11 @@ function write_env_usage(source_file::AbstractString, usage_filepath::AbstractSt
             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
+        open(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)
-
-        # 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
     end
+    return
 end
 
 function read_package(path::String)