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

Don't fail from kill signals if already unwinding.

Browse source
This commit is contained in:
Ben Blum 2013-08-02 17:14:56 -04:00
parent bd35798773
commit 92f60f4365
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/rt/kill.rs
View file

@ -530,13 +530,13 @@ impl Death {
/// Fails if a kill signal was received. /// Fails if a kill signal was received.
#[inline] #[inline]
pub fn check_killed(&self) { pub fn check_killed(&self, already_failing: bool) {
match self.kill_handle { match self.kill_handle {
Some(ref kill_handle) => Some(ref kill_handle) =>
// The task may be both unkillable and killed if it does some // The task may be both unkillable and killed if it does some
// synchronization during unwinding or cleanup (for example, // synchronization during unwinding or cleanup (for example,
// sending on a notify port). In that case failing won't help. // sending on a notify port). In that case failing won't help.
if self.unkillable == 0 && kill_handle.killed() { if self.unkillable == 0 && (!already_failing) && kill_handle.killed() {
fail!(KILLED_MSG); fail!(KILLED_MSG);
}, },
// This may happen during task death (see comments in collect_failure). // This may happen during task death (see comments in collect_failure).

2
src/libstd/rt/sched.rs
View file

@ -600,7 +600,7 @@ impl Scheduler {
// Must happen after running the cleanup job (of course). // Must happen after running the cleanup job (of course).
let task = Local::unsafe_borrow::<Task>(); let task = Local::unsafe_borrow::<Task>();
(*task).death.check_killed(); (*task).death.check_killed((*task).unwinder.unwinding);
} }
} }