move to fixed temp dir. Add debug log

Author: IanButterworth

base/file.jl

@@ -281,8 +281,11 @@ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false)
                     if err.code==Base.UV_EACCES && endswith(path, ".dll")
                         # Loaded DLLs cannot be deleted on Windows, even with posix delete mode
                         # but they can be moved. So move out to allow the dir to be deleted
-                        # and DLL deleted via the temp dir cleanup on next reboot
-                        mv(path, tempname() * "_" * basename(path))
+                        # TODO: Add a mechanism to delete these moved files after dlclose or process exit
+                        dir = mkpath(joinpath(tempdir(), "julia_delayed_deletes"))
+                        temp_path = tempname(dir, cleanup = false) * "_" * basename(path)
+                        @debug "Could not delete DLL most likely because it is loaded, moving to tempdir" path temp_path
+                        mv(path, temp_path)
                     end
                 end
             end

base/loading.jl

@@ -2902,7 +2902,11 @@ function compilecache(pkg::PkgId, path::String, internal_stderr::IO = stderr, in
             end
 
             if cache_objects
-                ocachefile = rename_unique_ocachefile(tmppath_so, ocachefile)
+                ocachefile_new = rename_unique_ocachefile(tmppath_so, ocachefile)
+                if ocachefile_new != ocachefile
+                    cachefile = cachefile_from_ocachefile(ocachefile_new)
+                    ocachefile = ocachefile_new
+                end
                 @static if Sys.isapple()
                     run(`$(Linking.dsymutil()) $ocachefile`, Base.DevNull(), Base.DevNull(), Base.DevNull())
                 end
@@ -2925,7 +2929,7 @@ function compilecache(pkg::PkgId, path::String, internal_stderr::IO = stderr, in
     end
 end
 
-function rename_unique_ocachefile(tmppath_so::String, ocachefile_orig::String, ocachefile::String = ocachefile_orig, num = 1)
+function rename_unique_ocachefile(tmppath_so::String, ocachefile_orig::String, ocachefile::String = ocachefile_orig, num = 0)
     try
         rename(tmppath_so, ocachefile; force=true)
     catch e