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

rt: Add rust_task::call_on_c_stack

Browse Source
This commit is contained in:
Brian Anderson
2012-02-08 21:42:04 -08:00
parent 1e2fe4ab8f
commit ea76d3f454
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/rt/rust_task.cpp
View File

@@ -194,7 +194,7 @@ void task_start_wrapper(spawn_args *a)
// The cleanup work needs lots of stack
cleanup_args ca = {a, threw_exception};
task->thread->c_context.call_and_change_stacks(&ca, (void*)cleanup_task);
task->call_on_c_stack(&ca, (void*)cleanup_task);
task->ctx.next->swap(task->ctx);
}
@@ -699,7 +699,18 @@ Returns true if we're currently running on the Rust stack
*/
bool
rust_task::on_rust_stack() {
return sp_in_stk_seg(get_sp(), stk);
uintptr_t sp = get_sp();
bool in_first_segment = sp_in_stk_seg(sp, stk);
if (in_first_segment) {
return true;
} else if (stk->next != NULL) {
// This happens only when calling the upcall to delete
// a stack segment
bool in_second_segment = sp_in_stk_seg(sp, stk->next);
return in_second_segment;
} else {
return false;
}
}
void
@@ -713,6 +724,12 @@ rust_task::config_notify(chan_handle chan) {
notify_chan = chan;
}
void
rust_task::call_on_c_stack(void *args, void *fn_ptr) {
I(thread, on_rust_stack());
thread->c_context.call_and_change_stacks(args, fn_ptr);
}
//
// Local Variables:
// mode: C++