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

rt: For now, only run the box annihilator after task failure

Browse Source
This commit is contained in:
Brian Anderson
2012-03-26 14:39:39 -07:00
parent 7f9ed39040
commit 5747fe7a2c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/rt/rust_task.cpp
View File

@@ -96,12 +96,6 @@ cleanup_task(cleanup_args *args) {
bool threw_exception = args->threw_exception;
rust_task *task = a->task;
cc::do_cc(task);
annihilate_boxes(task);
cc::do_final_cc(task);
task->die();
{
scoped_lock with(task->kill_lock);
if (task->killed && !threw_exception) {
@@ -110,6 +104,20 @@ cleanup_task(cleanup_args *args) {
}
}
// FIXME: For performance we should do the annihilator instead
// of the cycle collector even under normal termination, but
// since that would hide memory management errors (like not derefing
// boxes), it needs to be disableable in debug builds.
if (threw_exception) {
// FIXME: When the annihilator is more powerful and successfully
// runs resource destructors, etc. we can get rid of this cc
cc::do_cc(task);
annihilate_boxes(task);
}
cc::do_final_cc(task);
task->die();
task->notify(!threw_exception);
if (threw_exception) {