everything but cas, inc, and dec

Author: leios

src/atomics.jl

@@ -29,55 +29,47 @@ function __atomic(ex)
     error("@atomic macro incomplete!")
 end
 
-# arithmetic and bitwise operations
+# arithmetic, bitwise, and min/max operations
 
 const ops = Dict(
     :atomic_add!   => +,
     :atomic_sub!   => -,
     :atomic_and!   => &,
     :atomic_or!    => -,
     :atomic_xor!   => ⊻,
+    :atomic_min!   => min,
+    :atomic_max!   => max,
 )
 
+# Note: the type T prevents type convertion (for example, Float32 -> 64)
+#       can lead to errors if b is chosen to be of a different, compatible type
 for (name, op) in ops
-    @eval @inline function $name(ptr, b)
-        Core.Intrinsics.atomic_pointermodify(ptr, $op, b, :monotonic)
+    @eval @inline function $name(ptr::Ptr{T}, b::T) where T
+        Core.Intrinsics.atomic_pointermodify(ptr::Ptr{T}, $op, b::T, :monotonic)
     end
 end
 
-# Not sure what this one is...
-function atomic_cas!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
+# TODO: Not sure what this one is...
+function atomic_cas!(ptr::Ptr{T}, old::T, new::T) where T
+    Core.Intrinsics.atomic_pointerswap(ptr::Ptr{T}, x::T, :monotonic)
 end
 
-# TODO
-function atomic_dec!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
+# TODO: Not sure what this one is...
+function atomic_dec!(ptr::Ptr{T}, b::T) where T
+    Core.Intrinsics.atomic_pointermodify(ptr, -, 1, :monotonic)
 end
 
-# TODO
-function atomic_inc!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
+# TODO: Not sure what this one is...
+function atomic_inc!(ptr::Ptr{T}, b::T) where T
+    Core.Intrinsics.atomic_pointermodify(ptr, +, 1, :monotonic)
 end
 
-# TODO
-function atomic_max!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
+function atomic_xchg!(ptr::Ptr{T}, b::T) where T
+    Core.Intrinsics.atomic_pointerswap(ptr::Ptr{T}, x::T, :monotonic)
 end
 
-# TODO
-function atomic_min!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
-end
-
-# TODO
-function atomic_op!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
-end
-
-# TODO
-function atomic_xchg!(ptr, b)
-    Core.Intrinsics.atomic_pointermodify(ptr, &, b, :monotonic)
+function atomic_op!(ptr::Ptr{T}, op, b::T) where T
+    Core.Intrinsics.atomic_pointermodify(ptr::Ptr{T}, op, b::T, :monotonic)
 end
 
 ###