about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-08-10 12:57:53 -0700
committerBrian Anderson <banderson@mozilla.com>2011-08-10 13:02:31 -0700
commit0cd607bcbdc70d3d7ccefd5faf830cc8e5d68c86 (patch)
tree0e531d1593e88a8dd3e3f783d16257568652cf93 /src/rt/rust_upcall.cpp
parentf6ad0514087f985ce1c1aad126b28b8e17e2e005 (diff)
downloadrust-0cd607bcbdc70d3d7ccefd5faf830cc8e5d68c86.tar.gz
rust-0cd607bcbdc70d3d7ccefd5faf830cc8e5d68c86.zip
rt: Shutdown gracefully on failure
When the kernel fails, kill all tasks and wait for the schedulers to stop
instead of just exiting. I'm sure there are tons of lurking issues here but
this is enough to fail without leaking (at least in the absence of cleanups).
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 5feffe600c3..cd8d9b96e2e 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -195,8 +195,8 @@ upcall_fail(rust_task *task,
             size_t line) {
     LOG_UPCALL_ENTRY(task);
     LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, expr, file, line);
-    task->fail();
     task->die();
+    task->fail();
     task->notify_tasks_waiting_to_join();
     task->yield(4);
 }