ReentrantLock is thread-safe on Julia >=v1.2-DEV.28

Make ThreadSafeReentrantLock and alias for ReentrantLock on
Julia >=v1.2-DEV.28.

Author: oschulz

src/threadsafe.jl

@@ -5,34 +5,37 @@ export ThreadSafe
 abstract type ThreadSafe{T} end
 
 
-
 export ThreadSafeReentrantLock
 
-struct ThreadSafeReentrantLock
-    thread_lock::RecursiveSpinLock
-    task_lock::ReentrantLock
+@static if VERSION >= v"1.2-DEV.28"
+    const ThreadSafeReentrantLock = ReentrantLock
+else
+    struct ThreadSafeReentrantLock
+        thread_lock::RecursiveSpinLock
+        task_lock::ReentrantLock
 
-    ThreadSafeReentrantLock() = new(RecursiveSpinLock(), ReentrantLock())
-end
+        ThreadSafeReentrantLock() = new(RecursiveSpinLock(), ReentrantLock())
+    end
 
-function Base.lock(l::ThreadSafeReentrantLock)
-    # @debug "LOCKING $l"
-    lock(l.thread_lock)
-    try
-        lock(l.task_lock)
-    catch err
-        unlock(l.thread_lock)
-        rethrow()
+    function Base.lock(l::ThreadSafeReentrantLock)
+        # @debug "LOCKING $l"
+        lock(l.thread_lock)
+        try
+            lock(l.task_lock)
+        catch err
+            unlock(l.thread_lock)
+            rethrow()
+        end
     end
-end
 
 
-function Base.unlock(l::ThreadSafeReentrantLock)
-    # @debug "UNLOCKING $l"
-    try
-        unlock(l.task_lock)
-    finally
-        unlock(l.thread_lock)
+    function Base.unlock(l::ThreadSafeReentrantLock)
+        # @debug "UNLOCKING $l"
+        try
+            unlock(l.task_lock)
+        finally
+            unlock(l.thread_lock)
+        end
     end
 end
 

test/test_threadsafe.jl

@@ -9,12 +9,14 @@ using Base.Threads
 
     @testset "ThreadSafeReentrantLock" begin
         tsReLock = @inferred ThreadSafeReentrantLock()
-        lock(tsReLock)
-        @test islocked(tsReLock.thread_lock)
-        @test islocked(tsReLock.task_lock)
-        unlock(tsReLock)
-        @test !islocked(tsReLock.thread_lock)
-        @test !islocked(tsReLock.task_lock)
+        @static if VERSION < v"1.2-DEV.28"
+            lock(tsReLock)
+            @test islocked(tsReLock.thread_lock)
+            @test islocked(tsReLock.task_lock)
+            unlock(tsReLock)
+            @test !islocked(tsReLock.thread_lock)
+            @test !islocked(tsReLock.task_lock)
+        end
     end
 
     @testset "LockableValue" begin