Remove at-spinlock.

Locks taken in a finalizer should never be contended,
as ReentrantLock inhibits finalizers when they're
taken from a non-finalizer task.

Author: maleadt

lib/cudadrv/memory.jl

@@ -663,7 +663,7 @@ function __pin(ptr::Ptr{Nothing}, sz::Int)
     ctx = context()
     key = (ctx,ptr)
 
-    @lock __pin_lock begin
+    Base.@lock __pin_lock begin
         pin_count = if haskey(__pin_count, key)
             __pin_count[key] += 1
         else
@@ -687,7 +687,7 @@ end
 function __unpin(ptr::Ptr{Nothing}, ctx::CuContext)
     key = (ctx,ptr)
 
-    @spinlock __pin_lock begin
+    Base.@lock __pin_lock begin
         @assert haskey(__pin_count, key) "Cannot unpin unmanaged pointer $ptr."
         pin_count = __pin_count[key] -= 1
         @assert pin_count >= 0 "Double unpin for $ptr"

lib/cudnn/CUDNN.jl

@@ -121,7 +121,7 @@ function log_message(sev, udata, dbg_ptr, ptr)
     str = unsafe_string(ptr, len)   # XXX: can this yield?
 
     # print asynchronously
-    @spinlock log_lock begin
+    Base.@lock log_lock begin
         push!(log_messages, (; sev, dbg, str))
     end
     ccall(:uv_async_send, Cint, (Ptr{Cvoid},), udata)
@@ -153,7 +153,7 @@ function __runtime_init__()
     if (isdebug(:init, CUDNN) || Base.JLOptions().debug_level >= 2) &&
        version() >= v"8.2"  # NVIDIA bug #3256123
         log_cond[] = Base.AsyncCondition() do async_cond
-            message =  @lock log_lock popfirst!(log_messages)
+            message = Base.@lock log_lock popfirst!(log_messages)
             _log_message(message...)
         end
 

lib/utils/cache.jl

@@ -46,8 +46,7 @@ end
 
 # put a handle in the cache, or destroy it if it doesn't fit
 function Base.push!(f::Function, cache::HandleCache{K,V}, key::K, handle::V) where {K,V}
-    # XXX: take this lock in a normal way once we have JuliaLang/julia#35689
-    @spinlock cache.lock begin
+    lock(cache.lock) do
         delete!(cache.active_handles, key=>handle)
 
         if haskey(cache.idle_handles, key)

lib/utils/threading.jl

@@ -1,25 +1,4 @@
-export @spinlock, @lock, LazyInitialized
-
-const var"@lock" = Base.var"@lock"
-
-# a safe way to acquire locks from finalizers, where we can't wait (which switches tasks)
-macro spinlock(l, ex)
-  quote
-    temp = $(esc(l))
-    while !trylock(temp)
-      ccall(:jl_cpu_pause, Cvoid, ())
-      # Temporary solution before we have gc transition support in codegen.
-      ccall(:jl_gc_safepoint, Cvoid, ())
-      # we can't yield here
-    end
-    try
-      $(esc(ex))
-    finally
-      unlock(temp)
-    end
-  end
-end
-
+export LazyInitialized
 
 """
     LazyInitialized{T}()