about summary refs log tree commit diff
path: root/src/libstd/uv_global_loop.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-05-24 22:03:14 -0700
committerBrian Anderson <banderson@mozilla.com>2012-05-24 22:05:31 -0700
commit95898b4cfcbc5b47730aa722f3818f8b9028cb63 (patch)
treea7519cd1068f574033df9683baf2adaa06bc0fdb /src/libstd/uv_global_loop.rs
parent623acaa0139b77984ec93a0e0002b7149343ae37 (diff)
std: Simplify run_high_level_loop further
Diffstat (limited to 'src/libstd/uv_global_loop.rs')
-rw-r--r--src/libstd/uv_global_loop.rs17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index 377ba190825..5e3ecfd5318 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -94,29 +94,20 @@ fn get_monitor_task_gl() -> hl::high_level_loop unsafe {
 }
 
 fn spawn_high_level_loop() -> hl::high_level_loop unsafe {
-    let exit_po = port::<hl::high_level_loop>();
-    let exit_ch = exit_po.chan();
+    let hll_po = port::<hl::high_level_loop>();
+    let hll_ch = hll_po.chan();
 
     spawn_sched(single_threaded) {||
         #debug("entering global libuv task");
         weaken_task() {|weak_exit_po|
             #debug("global libuv task is now weak %?", weak_exit_po);
-            let loop_msg_po = port::<hl::high_level_msg>();
-            let loop_msg_ch = loop_msg_po.chan();
-            hl::run_high_level_loop(loop_msg_po) {|async_handle|
-                #debug("global libuv: before_run %?", async_handle);
-                let hll = hl::high_level_loop({
-                    async_handle: async_handle,
-                    op_chan: loop_msg_ch
-                });
-                exit_ch.send(hll);
-            }
+            hl::run_high_level_loop(hll_ch);
             #debug("global libuv task is leaving weakened state");
         };
         #debug("global libuv task exiting");
     };
 
-    exit_po.recv()
+    hll_po.recv()
 }
 
 #[cfg(test)]