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

rt: Move transition from rust_task to rust_task_thread

Browse Source
This commit is contained in:
Brian Anderson
2012-03-03 02:36:53 -08:00
parent 237652299e
commit 2465a63a69
4 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/rt/rust_task.cpp
View File

@@ -401,26 +401,16 @@ rust_task::free(void *p)
void
rust_task::transition(rust_task_list *src, rust_task_list *dst,
rust_cond *cond, const char* cond_name) {
bool unlock = false;
if(!thread->lock.lock_held_by_current_thread()) {
unlock = true;
thread->lock.lock();
}
DLOG(thread, task,
"task %s " PTR " state change '%s' -> '%s' while in '%s'",
name, (uintptr_t)this, src->name, dst->name, state->name);
I(thread, state == src);
src->remove(this);
dst->append(this);
{
scoped_lock with(state_lock);
state = dst;
this->cond = cond;
this->cond_name = cond_name;
}
thread->lock.signal();
if(unlock)
thread->lock.unlock();
thread->transition(this, src, dst, cond, cond_name);
}
void
rust_task::set_state(rust_task_list *state,
rust_cond *cond, const char* cond_name) {
scoped_lock with(state_lock);
this->state = state;
this->cond = cond;
this->cond_name = cond_name;
}
void