diff options
Diffstat (limited to 'src/libstd/task')
| -rw-r--r-- | src/libstd/task/mod.rs | 14 | ||||
| -rw-r--r-- | src/libstd/task/rt.rs | 42 |
2 files changed, 28 insertions, 28 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index de6410aa82f..f2563b37347 100644 --- a/src/libstd/task/mod.rs +++ b/src/libstd/task/mod.rs @@ -995,13 +995,13 @@ mod testrt { use libc; #[nolink] - pub extern { - unsafe fn rust_dbg_lock_create() -> *libc::c_void; - unsafe fn rust_dbg_lock_destroy(lock: *libc::c_void); - unsafe fn rust_dbg_lock_lock(lock: *libc::c_void); - unsafe fn rust_dbg_lock_unlock(lock: *libc::c_void); - unsafe fn rust_dbg_lock_wait(lock: *libc::c_void); - unsafe fn rust_dbg_lock_signal(lock: *libc::c_void); + extern { + pub unsafe fn rust_dbg_lock_create() -> *libc::c_void; + pub unsafe fn rust_dbg_lock_destroy(lock: *libc::c_void); + pub unsafe fn rust_dbg_lock_lock(lock: *libc::c_void); + pub unsafe fn rust_dbg_lock_unlock(lock: *libc::c_void); + pub unsafe fn rust_dbg_lock_wait(lock: *libc::c_void); + pub unsafe fn rust_dbg_lock_signal(lock: *libc::c_void); } } diff --git a/src/libstd/task/rt.rs b/src/libstd/task/rt.rs index 1c98283410a..3720bc585cc 100644 --- a/src/libstd/task/rt.rs +++ b/src/libstd/task/rt.rs @@ -30,39 +30,39 @@ pub type rust_task = libc::c_void; #[allow(non_camel_case_types)] // runtime type pub type rust_closure = libc::c_void; -pub extern { +extern { #[rust_stack] - fn rust_task_yield(task: *rust_task) -> bool; + pub fn rust_task_yield(task: *rust_task) -> bool; - fn rust_get_sched_id() -> sched_id; - fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id; - fn rust_sched_threads() -> libc::size_t; - fn rust_sched_current_nonlazy_threads() -> libc::size_t; + pub fn rust_get_sched_id() -> sched_id; + pub fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id; + pub fn rust_sched_threads() -> libc::size_t; + pub fn rust_sched_current_nonlazy_threads() -> libc::size_t; - fn get_task_id() -> task_id; + pub fn get_task_id() -> task_id; #[rust_stack] - fn rust_get_task() -> *rust_task; + pub fn rust_get_task() -> *rust_task; - fn new_task() -> *rust_task; - fn rust_new_task_in_sched(id: sched_id) -> *rust_task; + pub fn new_task() -> *rust_task; + pub fn rust_new_task_in_sched(id: sched_id) -> *rust_task; - fn start_task(task: *rust_task, closure: *rust_closure); + pub fn start_task(task: *rust_task, closure: *rust_closure); - fn rust_task_is_unwinding(task: *rust_task) -> bool; - fn rust_osmain_sched_id() -> sched_id; + pub fn rust_task_is_unwinding(task: *rust_task) -> bool; + pub fn rust_osmain_sched_id() -> sched_id; #[rust_stack] - fn rust_task_inhibit_kill(t: *rust_task); + pub fn rust_task_inhibit_kill(t: *rust_task); #[rust_stack] - fn rust_task_allow_kill(t: *rust_task); + pub fn rust_task_allow_kill(t: *rust_task); #[rust_stack] - fn rust_task_inhibit_yield(t: *rust_task); + pub fn rust_task_inhibit_yield(t: *rust_task); #[rust_stack] - fn rust_task_allow_yield(t: *rust_task); - fn rust_task_kill_other(task: *rust_task); - fn rust_task_kill_all(task: *rust_task); + pub fn rust_task_allow_yield(t: *rust_task); + pub fn rust_task_kill_other(task: *rust_task); + pub fn rust_task_kill_all(task: *rust_task); #[rust_stack] - fn rust_get_task_local_data(task: *rust_task) -> *mut *libc::c_void; + pub fn rust_get_task_local_data(task: *rust_task) -> *mut *libc::c_void; #[rust_stack] - fn rust_task_local_data_atexit(task: *rust_task, cleanup_fn: *u8); + pub fn rust_task_local_data_atexit(task: *rust_task, cleanup_fn: *u8); } |
