---

yaml
---
r: 13004
b: refs/heads/master
c: 6fa1a08
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9773a22119bf416a1c53d0ee30f6a127c7e274e1
+refs/heads/master: 6fa1a084f7714023c4594ec7a857359824dc3253
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/arc.rs

@@ -0,0 +1,59 @@
+#[doc = "An atomically reference counted wrapper that can be used
+hare immutable data between tasks."]
+
+export arc, get, clone;
+
+#[abi = "cdecl"]
+native mod rustrt {
+    #[rust_stack]
+    fn rust_atomic_increment(p: *mut libc::intptr_t)
+        -> libc::intptr_t;
+
+    #[rust_stack]
+    fn rust_atomic_decrement(p: *mut libc::intptr_t)
+        -> libc::intptr_t;
+}
+
+type arc_data<T> = {
+    mut count: libc::intptr_t,
+    data: T
+};
+
+resource arc_destruct<T>(data: *arc_data<T>) {
+    unsafe {
+        let ptr = ptr::mut_addr_of((*data).count);
+
+        let new_count = rustrt::rust_atomic_decrement(ptr);
+        assert new_count >= 0;
+        if new_count == 0 {
+            let _ptr : ~arc_data<T> = unsafe::reinterpret_cast(data);
+            // drop glue takes over.
+        }
+    }
+}
+
+type arc<T> = arc_destruct<T>;
+
+fn arc<T>(-data: T) -> arc<T> {
+    let data = ~{mut count: 1, data: data};
+    unsafe {
+        let ptr = unsafe::reinterpret_cast(data);
+        unsafe::forget(data);
+        arc_destruct(ptr)
+    }
+}
+
+fn get<T>(rc: &a.arc<T>) -> &a.T {
+    unsafe {
+        &(***rc).data
+    }
+}
+
+fn clone<T>(rc: &arc<T>) -> arc<T> {
+    let data = **rc;
+    unsafe {
+        rustrt::rust_atomic_increment(
+            ptr::mut_addr_of((*data).count));
+    }
+    arc_destruct(**rc)
+}

trunk/src/libstd/std.rc

@@ -17,7 +17,7 @@ export net, net_tcp;
 export uv, uv_ll, uv_hl, uv_global_loop;
 export c_vec, util, timer;
 export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap;
-export rope, arena;
+export rope, arena, arc;
 export ebml, dbg, getopts, json, rand, sha1, term, time, prettyprint;
 export test, tempfile, serialization;
 
@@ -66,6 +66,7 @@ mod term;
 mod time;
 mod prettyprint;
 mod arena;
+mod arc;
 
 #[cfg(unicode)]
 mod unicode;

trunk/src/rt/rust_builtin.cpp

@@ -816,6 +816,16 @@ rust_compare_and_swap_ptr(intptr_t *address,
     return sync::compare_and_swap(address, oldval, newval);
 }
 
+extern "C" CDECL intptr_t
+rust_atomic_increment(intptr_t *address) {
+    return sync::increment(address);
+}
+
+extern "C" CDECL intptr_t
+rust_atomic_decrement(intptr_t *address) {
+    return sync::decrement(address);
+}
+
 extern "C" CDECL void
 rust_task_weaken(rust_port_id chan) {
     rust_task *task = rust_get_current_task();

trunk/src/rt/rustrt.def.in

@@ -154,6 +154,8 @@ rust_dbg_lock_signal
 rust_dbg_call
 rust_osmain_sched_id
 rust_compare_and_swap_ptr
+rust_atomic_increment
+rust_atomic_decrement
 rust_global_env_chan_ptr
 rust_port_take
 rust_port_drop

trunk/src/test/run-pass/share-arc.rs

@@ -0,0 +1,28 @@
+use std;
+import std::arc;
+import comm::*;
+
+fn main() {
+    let v = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    let arc_v = arc::arc(v);
+
+    let p = port();
+    let c = chan(p);
+    
+    task::spawn() {||
+        let p = port();
+        c.send(chan(p));
+
+        let arc_v = p.recv();
+
+        let v = *arc::get::<[int]>(&arc_v);
+        assert v[3] == 4;
+    };
+
+    let c = p.recv();
+    c.send(arc::clone(&arc_v));
+
+    assert (*arc::get(&arc_v))[2] == 3;
+
+    log(info, arc_v);
+}