From 4808d59909b9350fcb557ec7e6f0ce21c505e803 Mon Sep 17 00:00:00 2001
From: Eric Holk <eric.holk@gmail.com>
Date: Fri, 10 Aug 2012 16:17:53 -0700
Subject: [PATCH] Terminate blocked receive packets on failure. Fixes #3168.

---
 src/libcore/pipes.rs            | 17 +++++++++++++++++
 src/test/run-pass/issue-3168.rs | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/test/run-pass/issue-3168.rs

diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs
index 052efdf3b41e5..0c81c7c824446 100644
--- a/src/libcore/pipes.rs
+++ b/src/libcore/pipes.rs
@@ -396,6 +396,23 @@ fn try_recv<T: send, Tbuffer: send>(-p: recv_packet_buffered<T, Tbuffer>)
     let p_ = p.unwrap();
     let p = unsafe { &*p_ };
 
+    struct drop_state {
+        p: &packet_header;
+
+        drop {
+            if task::failing() {
+                io::println("failing!");
+                self.p.state = terminated;
+                let old_task = swap_task(self.p.blocked_task, ptr::null());
+                if !old_task.is_null() {
+                    rustrt::rust_task_deref(old_task);
+                }
+            }
+        }
+    };
+
+    let _drop_state = drop_state { p: &p.header };
+
     // optimistic path
     match p.header.state {
       full => {
diff --git a/src/test/run-pass/issue-3168.rs b/src/test/run-pass/issue-3168.rs
new file mode 100644
index 0000000000000..421813962e491
--- /dev/null
+++ b/src/test/run-pass/issue-3168.rs
@@ -0,0 +1,19 @@
+fn main() {
+    let (c,p) = pipes::stream();
+    do task::try {
+        let (c2,p2) = pipes::stream();
+        do task::spawn {
+            p2.recv();
+            #error["brother fails"];
+            fail;
+        }   
+        let (c3,p3) = pipes::stream();
+        c.send(c3);
+        c2.send(());
+        #error["child blocks"];
+        p3.recv();
+    };  
+    #error["parent tries"];
+    assert !p.recv().try_send(());
+    #error("all done!");
+}