use Lockable in GC for consistency

Author: MilesCranmer

src/GC/GC.jl

@@ -8,8 +8,9 @@ See [`gc`](@ref).
 module GC
 
 using ..C: C
+using ..Utils: Lockable
 
-const QUEUE = (; items = C.PyPtr[], lock = Threads.SpinLock())
+const QUEUE = Lockable(C.PyPtr[], Threads.SpinLock())
 const HOOK = Ref{WeakRef}()
 
 """
@@ -67,13 +68,13 @@ function gc()
 end
 
 function unsafe_free_queue()
-    Base.@lock QUEUE.lock begin
-        for ptr in QUEUE.items
+    Base.@lock QUEUE begin
+        for ptr in QUEUE[]
             if ptr != C.PyNULL
                 C.Py_DecRef(ptr)
             end
         end
-        empty!(QUEUE.items)
+        empty!(QUEUE[])
     end
     nothing
 end
@@ -87,7 +88,7 @@ function enqueue(ptr::C.PyPtr)
             # If the current thread holds the GIL, then we can immediately free.
             C.Py_DecRef(ptr)
             # We may as well also free any other enqueued objects.
-            if !isempty(QUEUE.items)
+            if !isempty(QUEUE.value)
                 unsafe_free_queue()
             end
         else
@@ -96,7 +97,7 @@ function enqueue(ptr::C.PyPtr)
             #     in the branch above.
             # (b) If the GCHook() object below is finalized in an ordinary GC.
             # (c) If the user calls PythonCall.GC.gc().
-            Base.@lock QUEUE.lock push!(QUEUE.items, ptr)
+            Base.@lock QUEUE push!(QUEUE[], ptr)
         end
     end
     nothing
@@ -110,11 +111,11 @@ function enqueue_all(ptrs)
                     C.Py_DecRef(ptr)
                 end
             end
-            if !isempty(QUEUE.items)
+            if !isempty(QUEUE.value)
                 unsafe_free_queue()
             end
         else
-            Base.@lock QUEUE.lock append!(QUEUE.items, ptrs)
+            Base.@lock QUEUE append!(QUEUE[], ptrs)
         end
     end
     nothing
@@ -139,7 +140,7 @@ end
 function _gchook_finalizer(x)
     if C.CTX.is_initialized
         finalizer(_gchook_finalizer, x)
-        if !isempty(QUEUE.items) && C.PyGILState_Check() == 1
+        if !isempty(QUEUE.value) && C.PyGILState_Check() == 1
             unsafe_free_queue()
         end
     end

test/GC.jl

@@ -7,9 +7,9 @@
     end
     Threads.nthreads() > 1 &&
         VERSION >= v"1.10.0-" &&
-        @test !isempty(PythonCall.GC.QUEUE.items)
+        @test !isempty(PythonCall.GC.QUEUE.value)
     PythonCall.GC.gc()
-    @test isempty(PythonCall.GC.QUEUE.items)
+    @test isempty(PythonCall.GC.QUEUE.value)
 end
 
 @testitem "GC.GCHook" begin
@@ -21,7 +21,7 @@ end
     end
     Threads.nthreads() > 1 &&
         VERSION >= v"1.10.0-" &&
-        @test !isempty(PythonCall.GC.QUEUE.items)
+        @test !isempty(PythonCall.GC.QUEUE.value)
     GC.gc()
-    @test isempty(PythonCall.GC.QUEUE.items)
+    @test isempty(PythonCall.GC.QUEUE.value)
 end