squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

core: Turn task::unkillable, etc. into no-ops in newsched. #6377

Browse source 
Not necessary just yet but they make ARC not work.
This commit is contained in:
Brian Anderson 2013-05-09 17:21:13 -07:00
parent afcf4f2639
commit 013b7760b7
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libcore/rt/mod.rs
View file

@ -113,7 +113,6 @@ mod local_heap;
pub mod logging;
/// Tools for testing the runtime
#[cfg(test)]
pub mod test;
/// Reference counting

50
src/libcore/task/mod.rs
View file

@ -43,6 +43,7 @@ use task::rt::{task_id, sched_id};
use util;
use util::replace;
use unstable::finally::Finally;
use rt::{context, OldTaskContext};
#[cfg(test)] use comm::SharedChan;
@ -558,23 +559,33 @@ pub fn get_scheduler() -> Scheduler {
* ~~~
*/
pub unsafe fn unkillable<U>(f: &fn() -> U) -> U {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_inhibit_kill(t);
if context() == OldTaskContext {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_inhibit_kill(t);
f()
}).finally {
rt::rust_task_allow_kill(t);
}
} else {
// FIXME #6377
f()
}).finally {
rt::rust_task_allow_kill(t);
}
}
/// The inverse of unkillable. Only ever to be used nested in unkillable().
pub unsafe fn rekillable<U>(f: &fn() -> U) -> U {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_allow_kill(t);
if context() == OldTaskContext {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_allow_kill(t);
f()
}).finally {
rt::rust_task_inhibit_kill(t);
}
} else {
// FIXME #6377
f()
}).finally {
rt::rust_task_inhibit_kill(t);
}
}
@ -583,14 +594,19 @@ pub unsafe fn rekillable<U>(f: &fn() -> U) -> U {
* For use with exclusive ARCs, which use pthread mutexes directly.
*/
pub unsafe fn atomically<U>(f: &fn() -> U) -> U {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_inhibit_kill(t);
rt::rust_task_inhibit_yield(t);
if context() == OldTaskContext {
let t = rt::rust_get_task();
do (|| {
rt::rust_task_inhibit_kill(t);
rt::rust_task_inhibit_yield(t);
f()
}).finally {
rt::rust_task_allow_yield(t);
rt::rust_task_allow_kill(t);
}
} else {
// FIXME #6377
f()
}).finally {
rt::rust_task_allow_yield(t);
rt::rust_task_allow_kill(t);
}
}