mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linked failure: enable unidirectional propagate test; replace FIXMEs with comments (tag #1868).

Browse Source
This commit is contained in:
Ben Blum 2012-07-31 22:29:59 -04:00
parent 43b8114750
commit 7cb3f3e86a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcore/task.rs
View File

@ -81,11 +81,13 @@ enum task { task_handle(task_id) }
/**
* Indicates the manner in which a task exited.
*
* A task that completes without failing and whose supervised children
* complete without failing is considered to exit successfully.
* A task that completes without failing is considered to exit successfully.
* Supervised ancestors and linked siblings may yet fail after this task
* succeeds. Also note that in such a case, it may be nondeterministic whether
* linked failure or successful exit happen first.
*
* FIXME (See #1868): This description does not indicate the current behavior
* for linked failure.
* If you wish for this result's delivery to block until all linked and/or
* children tasks complete, recommend using a result future.
*/
enum task_result {
success,
@ -1505,8 +1507,7 @@ fn test_spawn_linked_unsup_default_opts() { // parent fails; child fails
// A couple bonus linked failure tests - testing for failure propagation even
// when the middle task exits successfully early before kill signals are sent.
#[test] #[should_fail] // #[ignore(cfg(windows))]
#[ignore] // FIXME (#1868) (bblum) make this work
#[test] #[should_fail] #[ignore(cfg(windows))]
fn test_spawn_failure_propagate_grandchild() {
// Middle task exits; does grandparent's failure propagate across the gap?
do spawn_supervised {

2
src/rt/rust_task.cpp
View File

@ -634,7 +634,7 @@ rust_task::on_rust_stack() {
void
rust_task::inhibit_kill() {
scoped_lock with(lifecycle_lock);
// FIXME (#1868) Check here if we have to die
// Here might be good, though not mandatory, to check if we have to die.
disallow_kill++;
}

4
src/rt/rust_task.h
View File

@ -431,10 +431,10 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
assert(get_sp_limit() != 0 && "Stack must be configured");
assert(next_rust_sp);
bool had_reentered_rust_stack = reentered_rust_stack;
bool had_reentered_rust_stack;
{
// FIXME (#1868) This must be racy. Figure it out.
scoped_lock with(lifecycle_lock);
had_reentered_rust_stack = reentered_rust_stack;
reentered_rust_stack = true;
}