---

yaml
---
r: 13042
b: refs/heads/master
c: 937ef18
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 81b8e20f31dbc5b2e985ba4109bf86fe6e06f2e2
+refs/heads/master: 937ef188e3539b4e83af1a0e52b41a2371e8bfd8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/uv_iotask.rs

@@ -114,7 +114,6 @@ fn run_loop(iotask_ch: chan<iotask>) unsafe {
     // initialize our loop data and store it in the loop
     let data: iotask_loop_data = {
         async_handle: async_handle,
-        mut active: true,
         msg_po_ptr: addr_of(msg_po)
     };
     ll::set_data_for_uv_handle(async_handle, addr_of(data));
@@ -137,7 +136,6 @@ fn run_loop(iotask_ch: chan<iotask>) unsafe {
 // data that lives for the lifetime of the high-evel oo
 type iotask_loop_data = {
     async_handle: *ll::uv_async_t,
-    mut active: bool,
     msg_po_ptr: *port<iotask_msg>
 };
 
@@ -158,29 +156,27 @@ crust fn wake_up_cb(async_handle: *ll::uv_async_t,
                      async_handle, status));
     let loop_ptr = ll::get_loop_for_uv_handle(async_handle);
     let data = ll::get_data_for_uv_handle(async_handle) as *iotask_loop_data;
-    // FIXME: What is this checking?
-    if (*data).active {
-        let msg_po = *((*data).msg_po_ptr);
-        while msg_po.peek() {
-            let msg = msg_po.recv();
-            if (*data).active {
-                alt msg {
-                  interaction(cb) {
-                    cb(loop_ptr);
-                  }
-                  teardown_loop {
-                    begin_teardown(data);
-                  }
-                }
-            } else {
-                // FIXME: drop msg ?
-            }
+    let msg_po = *((*data).msg_po_ptr);
+    while msg_po.peek() {
+        let msg = msg_po.recv();
+        alt msg {
+          interaction(cb) {
+            cb(loop_ptr);
+          }
+          teardown_loop {
+            begin_teardown(data);
+          }
         }
-    } else {
-        // loop not active
     }
 }
 
+fn begin_teardown(data: *iotask_loop_data) unsafe {
+    log(debug, "iotask begin_teardown() called, close async_handle");
+    // call user-suppled before_tear_down cb
+    let async_handle = (*data).async_handle;
+    ll::close(async_handle as *c_void, tear_down_close_cb);
+}
+
 crust fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
     let loop_ptr = ll::get_loop_for_uv_handle(handle);
     let loop_refs = ll::loop_refcount(loop_ptr);
@@ -189,13 +185,6 @@ crust fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe {
     assert loop_refs == 1i32;
 }
 
-fn begin_teardown(data: *iotask_loop_data) unsafe {
-    log(debug, "iotask begin_teardown() called, close async_handle");
-    // call user-suppled before_tear_down cb
-    let async_handle = (*data).async_handle;
-    ll::close(async_handle as *c_void, tear_down_close_cb);
-}
-
 #[cfg(test)]
 mod test {
     crust fn async_close_cb(handle: *ll::uv_async_t) unsafe {