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

Fixed deadlock in the scheduler caused by condition variables.

Browse Source
This commit is contained in:
Michael Bebenita
2010-08-09 08:06:08 -07:00
parent 4641fcef61
commit 5917ca3519
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rt/rust_dom.cpp
View File

@@ -262,8 +262,6 @@ void rust_dom::send_message(rust_message *message) {
this);
A(this, message->dom == this, "Message owned by non-local domain.");
_incoming_message_queue.enqueue(message);
_incoming_message_pending.signal();
_progress.signal();
}
/**
@@ -398,9 +396,11 @@ rust_dom::start_main_loop()
"all tasks are blocked, waiting for progress ...");
if (_log.is_tracing(rust_log::TASK))
log_state();
_progress.wait();
log(rust_log::TASK,
"progress made, resuming ...");
"all tasks are blocked, scheduler yielding ...");
sync::yield();
log(rust_log::TASK,
"scheduler resuming ...");
continue;
}
@@ -450,7 +450,14 @@ rust_dom::start_main_loop()
}
if (_incoming_message_queue.is_empty()) {
_incoming_message_pending.wait();
log(rust_log::DOM,
"waiting for %d dead tasks to become dereferenced, "
"scheduler yielding ...",
dead_tasks.length());
if (_log.is_tracing(rust_log::TASK)) {
log_state();
}
sync::yield();
} else {
drain_incoming_message_queue();
}