rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Convert os/priv/uv to new task_builder interface

Browse Source
This commit is contained in:
Ben Blum
2012-07-23 19:53:22 -04:00
parent c7a6a66e4b
commit e0e9e451e7
4 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcore/os.rs
View File

@@ -24,6 +24,7 @@ import option::{some, none};
import getcwd = rustrt::rust_getcwd;
import consts::*;
import task::task_builder;
export close, fclose, fsync_fd, waitpid;
export env, getenv, setenv, fdopen, pipe;
@@ -160,19 +161,14 @@ mod global_env {
fn get_global_env_chan() -> comm::chan<msg> {
let global_ptr = rustrt::rust_global_env_chan_ptr();
let builder_fn = || {
let builder = task::builder();
task::unsupervise(builder);
let task_build_fn = || {
// FIXME (#2621): This would be a good place to use a very small
// foreign stack
task::set_sched_mode(builder, task::single_threaded);
builder
task::task().sched_mode(task::single_threaded).unlinked()
};
unsafe {
priv::chan_from_global_ptr(
global_ptr, builder_fn, global_env_task)
global_ptr, task_build_fn, global_env_task)
}
}

11
src/libcore/priv.rs
View File

@@ -3,6 +3,7 @@
export chan_from_global_ptr, weaken_task;
import compare_and_swap = rustrt::rust_compare_and_swap_ptr;
import task::task_builder;
type rust_port_id = uint;
@@ -23,7 +24,7 @@ type global_ptr = *libc::uintptr_t;
*/
unsafe fn chan_from_global_ptr<T: send>(
global: global_ptr,
builder: fn() -> task::builder,
task_fn: fn() -> task::task_builder,
+f: fn~(comm::port<T>)
) -> comm::chan<T> {
@@ -41,7 +42,7 @@ unsafe fn chan_from_global_ptr<T: send>(
let setup_po = comm::port();
let setup_ch = comm::chan(setup_po);
let setup_ch = do task::run_listener(builder()) |setup_po| {
let setup_ch = do task_fn().spawn_listener |setup_po| {
let po = comm::port::<T>();
let ch = comm::chan(po);
comm::send(setup_ch, ch);
@@ -92,7 +93,7 @@ fn test_from_global_chan1() {
// Create the global channel, attached to a new task
let ch = unsafe {
do chan_from_global_ptr(globchanp, task::builder) |po| {
do chan_from_global_ptr(globchanp, task::task) |po| {
let ch = comm::recv(po);
comm::send(ch, true);
let ch = comm::recv(po);
@@ -106,7 +107,7 @@ fn test_from_global_chan1() {
// This one just reuses the previous channel
let ch = unsafe {
do chan_from_global_ptr(globchanp, task::builder) |po| {
do chan_from_global_ptr(globchanp, task::task) |po| {
let ch = comm::recv(po);
comm::send(ch, false);
}
@@ -135,7 +136,7 @@ fn test_from_global_chan2() {
do task::spawn {
let ch = unsafe {
do chan_from_global_ptr(
globchanp, task::builder) |po| {
globchanp, task::task) |po| {
for uint::range(0u, 10u) |_j| {
let ch = comm::recv(po);