Merge pull request #92 from JuliaData/jps/no-unsafeatomics

Remove UnsafeAtomics dependency
JuliaData · Dec 5, 2024 · 41e6dd6 · 41e6dd6
2 parents 3d77bff + 1d4f78c
commit 41e6dd6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -15,15 +15,13 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 ScopedValues = "7e506255-f358-4e82-b7e4-beb19740aa63"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
-UnsafeAtomics = "013be700-e6cd-48c3-b4a1-df204f14c38f"
 
 [compat]
 ConcurrentCollections = "0.1"
 DataStructures = "0.18"
 DistributedNext = "1"
 Preferences = "1"
 ScopedValues = "1"
-UnsafeAtomics = "0.2"
 julia = "1.9"
 
 [extras]

diff --git a/src/read_write_lock.jl b/src/read_write_lock.jl
@@ -1,7 +1,5 @@
 # Adapted from ConcurrentUtils/src/read_write_lock.jl
 
-import UnsafeAtomics
-
 abstract type AbstractReadWriteLock <: Base.AbstractLock end
 
 const NOTLOCKED = UInt64(0)
@@ -67,7 +65,7 @@ function lock_read(rwlock::ReadWriteLock)
         pointer_from_objref(rwlock) + OFFSET_NREADERS_AND_WRITELOCK,
     )
     GC.@preserve rwlock begin
-        _, n = UnsafeAtomics.modify!(ptr, +, NREADERS_INC, UnsafeAtomics.acq_rel)
+        _, n = Core.Intrinsics.atomic_pointermodify(ptr, +, NREADERS_INC, :acquire_release)
     end
     # n = @atomic :acquire_release rwlock.nreaders_and_writelock += NREADERS_INC
 
@@ -93,7 +91,7 @@ function unlock_read(rwlock::ReadWriteLock)
         pointer_from_objref(rwlock) + OFFSET_NREADERS_AND_WRITELOCK,
     )
     GC.@preserve rwlock begin
-        _, n = UnsafeAtomics.modify!(ptr, -, NREADERS_INC, UnsafeAtomics.acq_rel)
+        _, n = Core.Intrinsics.atomic_pointermodify(ptr, -, NREADERS_INC, :acquire_release)
     end
     # n = @atomic :acquire_release rwlock.nreaders_and_writelock -= NREADERS_INC