---

yaml
---
r: 143000
b: refs/heads/try2
c: 2a99163
h: refs/heads/master
v: v3

Author: bblum

[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: 10a400ffaa8b67add66a62bde0ef3c415d7aed5f
+refs/heads/try2: 2a99163f5d54ff26921cda0b12a99e5bd768b873
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -14,6 +14,7 @@ use comm;
 use libc;
 use ptr;
 use option::*;
+use either::{Either, Left, Right};
 use task;
 use task::atomically;
 use unstable::atomics::{AtomicOption,AtomicUint,Acquire,Release,SeqCst};
@@ -137,6 +138,31 @@ impl<T: Send> UnsafeAtomicRcBox<T> {
             }
         }
     }
+
+    /// As unwrap above, but without blocking. Returns 'Left(self)' if this is
+    /// not the last reference; 'Right(unwrapped_data)' if so.
+    pub unsafe fn try_unwrap(self) -> Either<UnsafeAtomicRcBox<T>, T> {
+        let mut this = self; // FIXME(#4330) mutable self
+        let mut data: ~AtomicRcBoxData<T> = cast::transmute(this.data);
+        // This can of course race with anybody else who has a handle, but in
+        // such a case, the returned count will always be at least 2. If we
+        // see 1, no race was possible. All that matters is 1 or not-1.
+        let count = data.count.load(Acquire);
+        assert!(count >= 1);
+        // The more interesting race is one with an unwrapper. They may have
+        // already dropped their count -- but if so, the unwrapper pointer
+        // will have been set first, which the barriers ensure we will see.
+        // (Note: using is_empty(), not take(), to not free the unwrapper.)
+        if count == 1 && data.unwrapper.is_empty(Acquire) {
+            // Tell this handle's destructor not to run (we are now it).
+            this.data = ptr::mut_null();
+            // FIXME(#3224) as above
+            Right(data.data.take_unwrap())
+        } else {
+            cast::forget(data);
+            Left(this)
+        }
+    }
 }
 
 impl<T: Send> Clone for UnsafeAtomicRcBox<T> {
@@ -380,13 +406,54 @@ mod tests {
     }
 
     #[test]
-    fn unsafe_unwrap_basic() {
+    fn arclike_unwrap_basic() {
         unsafe {
             let x = UnsafeAtomicRcBox::new(~~"hello");
             assert!(x.unwrap() == ~~"hello");
         }
     }
 
+    #[test]
+    fn arclike_try_unwrap() {
+        unsafe {
+            let x = UnsafeAtomicRcBox::new(~~"hello");
+            assert!(x.try_unwrap().expect_right("try_unwrap failed") == ~~"hello");
+        }
+    }
+
+    #[test]
+    fn arclike_try_unwrap_fail() {
+        unsafe {
+            let x = UnsafeAtomicRcBox::new(~~"hello");
+            let x2 = x.clone();
+            let left_x = x.try_unwrap();
+            assert!(left_x.is_left());
+            util::ignore(left_x);
+            assert!(x2.try_unwrap().expect_right("try_unwrap none") == ~~"hello");
+        }
+    }
+
+    #[test]
+    fn arclike_try_unwrap_unwrap_race() {
+        // When an unwrap and a try_unwrap race, the unwrapper should always win.
+        unsafe {
+            let x = UnsafeAtomicRcBox::new(~~"hello");
+            let x2 = Cell::new(x.clone());
+            let (p,c) = comm::stream();
+            do task::spawn {
+                c.send(());
+                assert!(x2.take().unwrap() == ~~"hello");
+                c.send(());
+            }
+            p.recv();
+            task::yield(); // Try to make the unwrapper get blocked first.
+            let left_x = x.try_unwrap();
+            assert!(left_x.is_left());
+            util::ignore(left_x);
+            p.recv();
+        }
+    }
+
     #[test]
     fn exclusive_unwrap_basic() {
         // Unlike the above, also tests no double-freeing of the LittleLock.