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

rt: Fix bugs in the osmain scheduler

Browse Source
This commit is contained in:
Brian Anderson
2012-04-03 17:39:35 -07:00
parent bef72447e7
commit c0e12854ed
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rt/rust_kernel.cpp
View File

@@ -78,6 +78,18 @@ rust_kernel::create_scheduler(rust_sched_launcher_factory *launchfac,
rust_scheduler *sched;
{
scoped_lock with(sched_lock);
if (sched_table.size() == 1) {
// The OS main scheduler may not exit while there are other
// schedulers
KLOG_("Disallowing osmain scheduler to exit");
sched_lock.unlock();
rust_scheduler *sched = get_scheduler_by_id(osmain_scheduler);
assert(sched != NULL);
sched->disallow_exit();
sched_lock.lock();
}
id = max_sched_id++;
K(srv, id != INTPTR_MAX, "Hit the maximum scheduler id");
sched = new (this, "rust_scheduler")
@@ -138,8 +150,8 @@ rust_kernel::wait_for_schedulers()
// It's only the osmain scheduler left. Tell it to exit
rust_scheduler *sched = get_scheduler_by_id(osmain_scheduler);
assert(sched != NULL);
sched_lock.lock();
sched->allow_exit();
sched_lock.lock();
}
}
if (!sched_table.empty()) {