about summary refs log tree commit diff
path: root/src/rt/rust_kernel.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-07-29 21:43:22 -0700
committerBrian Anderson <banderson@mozilla.com>2011-07-29 22:43:11 -0700
commit6657e729de2d4544d4f014091ef05878937895dc (patch)
tree891d84803a2a13637a67e4bca1e0ec9c4bf5195e /src/rt/rust_kernel.cpp
parent96a629d2fa5144ccba39cc0e4258b6e0fe2da283 (diff)
downloadrust-6657e729de2d4544d4f014091ef05878937895dc.tar.gz
rust-6657e729de2d4544d4f014091ef05878937895dc.zip
Lock the new task's scheduler when creating a task
Previously we were locking the spawning task's scheduler. I couldn't
see that that was protecting anything. The newborn_task list in the new task's
scheduler though was unprotected from concurrent access. So now we're locking
the new task's scheduler.
Diffstat (limited to 'src/rt/rust_kernel.cpp')
-rw-r--r--src/rt/rust_kernel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp
index 1eeb9b2c018..7ff2f16a228 100644
--- a/src/rt/rust_kernel.cpp
+++ b/src/rt/rust_kernel.cpp
@@ -135,7 +135,9 @@ int rust_kernel::start_task_threads()
 
 rust_task *
 rust_kernel::create_task(rust_task *spawner, const char *name) {
-    return threads[rand(&rctx) % num_threads]->create_task(spawner, name);
+    rust_scheduler *thread = threads[rand(&rctx) % num_threads];
+    scoped_lock with(thread->lock);
+    return thread->create_task(spawner, name);
 }
 
 void rust_kernel::wakeup_schedulers() {