---

yaml
---
r: 142575
b: refs/heads/try2
c: 8f77a6f
h: refs/heads/master
i:
  142573: 4af518a
  142571: f74453b
  142567: 2b6afb3
  142559: 6d3e854
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6d8d73cfc4cba2fdb2ee67448df39d89be08ce69
+refs/heads/try2: 8f77a6f422184dacc14ae1b6a042c321e06bef88
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/unstable/sync.rs

@@ -208,25 +208,50 @@ extern {
 /* *********************************************************************/
 
 //FIXME: #5042 This should be replaced by proper atomic type
-pub struct AtomicUint(uint);
-pub impl AtomicUint {
-    fn load(&self) -> uint {
+pub struct AtomicUint {
+    priv inner: uint
+}
+
+impl AtomicUint {
+    pub fn new(val: uint) -> AtomicUint { AtomicUint { inner: val } }
+    pub fn load(&self) -> uint {
         unsafe { intrinsics::atomic_load(cast::transmute(self)) as uint }
     }
-    fn store(&mut self, val:uint) {
+    pub fn store(&mut self, val: uint) {
         unsafe { intrinsics::atomic_store(cast::transmute(self), val as int); }
     }
-    fn add(&mut self, val:int) -> uint {
+    pub fn add(&mut self, val: int) -> uint {
         unsafe { intrinsics::atomic_xadd(cast::transmute(self), val as int) as uint }
     }
-    fn cas(&self, old:uint, new:uint) -> uint {
+    pub fn cas(&mut self, old:uint, new: uint) -> uint {
         unsafe { intrinsics::atomic_cxchg(cast::transmute(self), old as int, new as int) as uint }
     }
 }
 
+pub struct AtomicInt {
+    priv inner: int
+}
+
+impl AtomicInt {
+    pub fn new(val: int) -> AtomicInt { AtomicInt { inner: val } }
+    pub fn load(&self) -> int {
+        unsafe { intrinsics::atomic_load(&self.inner) }
+    }
+    pub fn store(&mut self, val: int) {
+        unsafe { intrinsics::atomic_store(&mut self.inner, val); }
+    }
+    pub fn add(&mut self, val: int) -> int {
+        unsafe { intrinsics::atomic_xadd(&mut self.inner, val) }
+    }
+    pub fn cas(&mut self, old: int, new: int) -> int {
+        unsafe { intrinsics::atomic_cxchg(&mut self.inner, old, new) }
+    }
+}
+
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use comm;
     use super::exclusive;
     use task;
@@ -278,4 +303,28 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
+
+    #[test]
+    fn atomic_int_smoke_test() {
+        let mut i = AtomicInt::new(0);
+        i.store(10);
+        assert!(i.load() == 10);
+        assert!(i.add(1) == 10);
+        assert!(i.load() == 11);
+        assert!(i.cas(11, 12) == 11);
+        assert!(i.cas(11, 13) == 12);
+        assert!(i.load() == 12);
+    }
+
+    #[test]
+    fn atomic_uint_smoke_test() {
+        let mut i = AtomicUint::new(0);
+        i.store(10);
+        assert!(i.load() == 10);
+        assert!(i.add(1) == 10);
+        assert!(i.load() == 11);
+        assert!(i.cas(11, 12) == 11);
+        assert!(i.cas(11, 13) == 12);
+        assert!(i.load() == 12);
+    }
 }