OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std: Remove unused args from run_high_level_loop

Browse Source
This commit is contained in:
Brian Anderson 2012-05-24 21:48:40 -07:00
parent 444ff687a2
commit 623acaa013
2 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/uv_global_loop.rs
View File

@ -103,29 +103,14 @@ fn spawn_high_level_loop() -> hl::high_level_loop unsafe {
#debug("global libuv task is now weak %?", 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_po = port::<hl::high_level_msg>();
let loop_msg_ch = loop_msg_po.chan(); let loop_msg_ch = loop_msg_po.chan();
hl::run_high_level_loop( hl::run_high_level_loop(loop_msg_po) {|async_handle|
loop_msg_po,
// before_run
{|async_handle|
#debug("global libuv: before_run %?", async_handle); #debug("global libuv: before_run %?", async_handle);
let hll = hl::high_level_loop({ let hll = hl::high_level_loop({
async_handle: async_handle, async_handle: async_handle,
op_chan: loop_msg_ch op_chan: loop_msg_ch
}); });
exit_ch.send(hll); exit_ch.send(hll);
},
// before_msg_process
{|async_handle, loop_active|
#debug("global libuv: before_msg_drain %? %?",
async_handle, loop_active);
true
},
// before_tear_down
{|async_handle|
#debug("libuv task: before_tear_down %?",
async_handle);
} }
);
#debug("global libuv task is leaving weakened state"); #debug("global libuv task is leaving weakened state");
}; };
#debug("global libuv task exiting"); #debug("global libuv task exiting");

30
src/libstd/uv_hl.rs
View File

@ -61,10 +61,7 @@ the loop's msg port
provided `async_handle`. `uv_run` should return shortly after provided `async_handle`. `uv_run` should return shortly after
"] "]
unsafe fn run_high_level_loop(msg_po: port<high_level_msg>, unsafe fn run_high_level_loop(msg_po: port<high_level_msg>,
before_run: fn~(*ll::uv_async_t), before_run: fn~(*ll::uv_async_t)) {
before_msg_process:
fn~(*ll::uv_async_t, bool) -> bool,
before_tear_down: fn~(*ll::uv_async_t)) {
let loop_ptr = ll::loop_new(); let loop_ptr = ll::loop_new();
// set up the special async handle we'll use to allow multi-task // set up the special async handle we'll use to allow multi-task
// communication with this loop // communication with this loop
@ -77,8 +74,6 @@ unsafe fn run_high_level_loop(msg_po: port<high_level_msg>,
let data: hl_loop_data = { let data: hl_loop_data = {
async_handle: async_handle, async_handle: async_handle,
mut active: true, mut active: true,
before_msg_process: before_msg_process,
before_tear_down: before_tear_down,
msg_po_ptr: addr_of(msg_po) msg_po_ptr: addr_of(msg_po)
}; };
ll::set_data_for_uv_handle(async_handle, addr_of(data)); ll::set_data_for_uv_handle(async_handle, addr_of(data));
@ -130,8 +125,6 @@ fn exit(hl_loop: high_level_loop) unsafe {
type hl_loop_data = { type hl_loop_data = {
async_handle: *ll::uv_async_t, async_handle: *ll::uv_async_t,
mut active: bool, mut active: bool,
before_msg_process: fn~(*ll::uv_async_t, bool) -> bool,
before_tear_down: fn~(*ll::uv_async_t),
msg_po_ptr: *port<high_level_msg> msg_po_ptr: *port<high_level_msg>
}; };
@ -160,8 +153,6 @@ crust fn high_level_wake_up_cb(async_handle: *ll::uv_async_t,
if (*data).active { if (*data).active {
alt msg { alt msg {
interaction(cb) { interaction(cb) {
(*data).before_msg_process(async_handle,
(*data).active);
cb(loop_ptr); cb(loop_ptr);
} }
teardown_loop { teardown_loop {
@ -189,7 +180,6 @@ fn begin_teardown(data: *hl_loop_data) unsafe {
log(debug, "high_level_tear_down() called, close async_handle"); log(debug, "high_level_tear_down() called, close async_handle");
// call user-suppled before_tear_down cb // call user-suppled before_tear_down cb
let async_handle = (*data).async_handle; let async_handle = (*data).async_handle;
(*data).before_tear_down(async_handle);
ll::close(async_handle as *c_void, tear_down_close_cb); ll::close(async_handle as *c_void, tear_down_close_cb);
} }
@ -236,10 +226,7 @@ mod test {
task::spawn_sched(task::manual_threads(1u)) {|| task::spawn_sched(task::manual_threads(1u)) {||
let msg_po = comm::port::<high_level_msg>(); let msg_po = comm::port::<high_level_msg>();
let msg_ch = comm::chan(msg_po); let msg_ch = comm::chan(msg_po);
run_high_level_loop( run_high_level_loop(msg_po) {|async_handle|
msg_po,
// before_run
{|async_handle|
log(debug,#fmt("hltest before_run: async_handle %?", log(debug,#fmt("hltest before_run: async_handle %?",
async_handle)); async_handle));
// do an async_send with it // do an async_send with it
@ -248,18 +235,7 @@ mod test {
async_handle: async_handle, async_handle: async_handle,
op_chan: msg_ch op_chan: msg_ch
})); }));
}, }
// before_msg_drain
{|async_handle, status|
log(debug,#fmt("hltest before_msg_drain: handle %? %?",
async_handle, status));
true
},
// before_tear_down
{|async_handle|
log(debug,#fmt("hl test_loop b4_tear_down: async %?",
async_handle));
});
comm::send(exit_ch, ()); comm::send(exit_ch, ());
}; };
ret comm::recv(hl_loop_port); ret comm::recv(hl_loop_port);