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

make disallow_kill an int for nested unkillables (closes #2782)

Browse Source
This commit is contained in:
Ben Blum
2012-07-05 19:55:01 -04:00
parent 7f56d74072
commit 7b3add0632
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rt/rust_task.cpp
View File

@@ -38,7 +38,7 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state,
cond_name("none"),
killed(false),
reentered_rust_stack(false),
disallow_kill(false),
disallow_kill(0),
c_stack(NULL),
next_c_sp(0),
next_rust_sp(0),
@@ -237,7 +237,7 @@ rust_task::must_fail_from_being_killed() {
bool
rust_task::must_fail_from_being_killed_unlocked() {
kill_lock.must_have_lock();
return killed && !reentered_rust_stack && !disallow_kill;
return killed && !reentered_rust_stack && disallow_kill == 0;
}
// Only run this on the rust stack
@@ -683,13 +683,14 @@ rust_task::on_rust_stack() {
void
rust_task::inhibit_kill() {
scoped_lock with(kill_lock);
disallow_kill = true;
disallow_kill++;
}
void
rust_task::allow_kill() {
scoped_lock with(kill_lock);
disallow_kill = false;
assert(disallow_kill > 0 && "Illegal allow_kill(): already killable!");
disallow_kill--;
}
//