diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-06-27 10:08:57 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-06-27 10:08:57 -0700 |
| commit | bc9fa31618207ae71d3db9cc6eef505645cdc893 (patch) | |
| tree | ed2230a1ae0c4671e311f36f264f24e7d3702497 /src/rt/rust_dom.cpp | |
| parent | 022ebc198b9e9e42880a4f3bcd31565533333296 (diff) | |
| download | rust-bc9fa31618207ae71d3db9cc6eef505645cdc893.tar.gz rust-bc9fa31618207ae71d3db9cc6eef505645cdc893.zip | |
A little tidying in rt.
Diffstat (limited to 'src/rt/rust_dom.cpp')
| -rw-r--r-- | src/rt/rust_dom.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/rt/rust_dom.cpp b/src/rt/rust_dom.cpp index ca3ee9c6a30..c9c6b56c09e 100644 --- a/src/rt/rust_dom.cpp +++ b/src/rt/rust_dom.cpp @@ -269,7 +269,11 @@ 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); + // + // FIXME: time-based interruption is not presently working; worked + // in rustboot and has been completely broken in rustc. + // + // rust_timer timer(this); DLOG(this, dom, "started domain loop %d", id); @@ -332,14 +336,6 @@ rust_dom::start_main_loop(int id) { scheduled_task->rust_sp, id); - /* - // These invariants are no longer valid, as rust_sp is not - // updated. - I(this, scheduled_task->rust_sp >= - (uintptr_t) &scheduled_task->stk->data[0]); - I(this, scheduled_task->rust_sp < scheduled_task->stk->limit); - */ - reap_dead_tasks(); } @@ -371,14 +367,14 @@ rust_dom::start_main_loop(int id) { int rust_dom::start_main_loops(int num_threads) { dom_worker *worker = NULL; - + // -1, because this thread will also be a worker. for(int i = 0; i < num_threads - 1; ++i) { worker = new dom_worker(i + 1, this); worker->start(); threads.push(worker); } - + start_main_loop(0); while(threads.pop(&worker)) { |
