Conservatively serialize nearly all upcalls. Successfuly ran make check with RUST_THREADS=8, so we're probably fairly safe now. In the future we can relax the synchronization to get better performance.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/rt/rust_dom.cpp b/src/rt/rust_dom.cpp
index ac258f5c973..5a2175f36a2 100644
--- a/src/rt/rust_dom.cpp
+++ b/src/rt/rust_dom.cpp
@@ -268,7 +268,7 @@ rust_dom::start_main_loop(int id) {
     scheduler_lock.lock();
 
     // Make sure someone is watching, to pull us out of infinite loops.
-    rust_timer timer(this);
+    //rust_timer timer(this);
 
     DLOG(this, dom, "started domain loop %d", id);
 
@@ -395,13 +395,13 @@ rust_dom::get_cache() {
 
 rust_task *
 rust_dom::create_task(rust_task *spawner, const char *name) {
-    scheduler_lock.lock();
+    //scheduler_lock.lock();
     rust_task *task =
         new (this) rust_task (this, &newborn_tasks, spawner, name);
     DLOG(this, task, "created task: " PTR ", spawner: %s, name: %s",
                         task, spawner ? spawner->name : "null", name);
     newborn_tasks.append(task);
-    scheduler_lock.unlock();
+    //scheduler_lock.unlock();
     return task;
 }