squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rt: Protect rust_task::supervisor with a lock

Browse source
This commit is contained in:
Brian Anderson 2012-03-02 16:33:24 -08:00
parent f4ce965ce7
commit 04d9cc18a5
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/rt/rust_task.cpp
View file

@ -77,7 +77,6 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
state(state),
cond(NULL),
cond_name("none"),
supervisor(spawner),
list_index(-1),
next_port_id(0),
rendezvous_ptr(0),
@ -92,7 +91,8 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
reentered_rust_stack(false),
c_stack(NULL),
next_c_sp(0),
next_rust_sp(0)
next_rust_sp(0),
supervisor(spawner)
{
LOGPTR(thread, "new task", (uintptr_t)this);
DLOG(thread, task, "sizeof(task) = %d (0x%x)", sizeof *this, sizeof *this);
@ -103,6 +103,7 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
}
}
// NB: This does not always run on the task's scheduler thread
void
rust_task::delete_this()
{
@ -112,8 +113,11 @@ rust_task::delete_this()
name, (uintptr_t)this, ref_count);
// FIXME: We should do this when the task exits, not in the destructor
if (supervisor) {
supervisor->deref();
{
scoped_lock with(supervisor_lock);
if (supervisor) {
supervisor->deref();
}
}
/* FIXME: tighten this up, there are some more
@ -302,6 +306,7 @@ rust_task::conclude_failure() {
void
rust_task::fail_parent() {
scoped_lock with(supervisor_lock);
if (supervisor) {
DLOG(thread, task,
"task %s @0x%" PRIxPTR
@ -317,6 +322,7 @@ rust_task::fail_parent() {
void
rust_task::unsupervise()
{
scoped_lock with(supervisor_lock);
if (supervisor) {
DLOG(thread, task,
"task %s @0x%" PRIxPTR

4
src/rt/rust_task.h
View file

@ -71,7 +71,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
rust_task_list *state;
rust_cond *cond;
const char *cond_name;
rust_task *supervisor; // Parent-link for failure propagation.
int32_t list_index;
rust_port_id next_port_id;
@ -120,6 +119,9 @@ private:
rust_port_selector port_selector;
lock_and_signal supervisor_lock;
rust_task *supervisor; // Parent-link for failure propagation.
// Called when the atomic refcount reaches zero
void delete_this();