---

yaml
---
r: 12561
b: refs/heads/master
c: f06362d
h: refs/heads/master
i:
  12559: 95f5365
v: v3

Author: olsonjeffery

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c6667c06c34a25a8a21a1805b4f454f2d05d337c
+refs/heads/master: f06362d5bbef9c569e06d66662cf49ead846ce0a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/priv.rs

@@ -1,6 +1,6 @@
 #[doc(hidden)];
 
-export chan_from_global_ptr;
+export chan_from_global_ptr, weaken_task;
 
 import compare_and_swap = rustrt::rust_compare_and_swap_ptr;
 
@@ -32,8 +32,11 @@ unsafe fn chan_from_global_ptr<T: send>(
         abort
     }
 
+    log(debug,"ENTERING chan_from_global_ptr, before is_prob_zero check");
     let is_probably_zero = *global == 0u;
+    log(debug,"after is_prob_zero check");
     if is_probably_zero {
+        log(debug,"is probably zero...");
         // There's no global channel. We must make it
 
         let setup_po = comm::port();
@@ -51,14 +54,17 @@ unsafe fn chan_from_global_ptr<T: send>(
             }
         };
 
+        log(debug,"before setup recv..");
         // This is the proposed global channel
         let ch = comm::recv(setup_po);
         // 0 is our sentinal value. It is not a valid channel
         assert unsafe::reinterpret_cast(ch) != 0u;
 
         // Install the channel
+        log(debug,"BEFORE COMPARE AND SWAP");
         let swapped = compare_and_swap(
             global, 0u, unsafe::reinterpret_cast(ch));
+        log(debug,#fmt("AFTER .. swapped? %?", swapped));
 
         if swapped {
             // Success!
@@ -70,6 +76,7 @@ unsafe fn chan_from_global_ptr<T: send>(
             unsafe::reinterpret_cast(*global)
         }
     } else {
+        log(debug, "global != 0");
         unsafe::reinterpret_cast(*global)
     }
 }