nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-11 16:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rt: Add locking invariants to rust_task

Browse Source
This commit is contained in:
Brian Anderson 2011-11-11 12:06:18 -08:00
parent 5e0e32faac
commit 2385deaa0d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rt/rust_task.cpp
View File

@ -440,6 +440,7 @@ rust_task::transition(rust_task_list *src, rust_task_list *dst) {
void void
rust_task::block(rust_cond *on, const char* name) { rust_task::block(rust_cond *on, const char* name) {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
LOG(this, task, "Blocking on 0x%" PRIxPTR ", cond: 0x%" PRIxPTR, LOG(this, task, "Blocking on 0x%" PRIxPTR ", cond: 0x%" PRIxPTR,
(uintptr_t) on, (uintptr_t) cond); (uintptr_t) on, (uintptr_t) cond);
@ -453,6 +454,7 @@ rust_task::block(rust_cond *on, const char* name) {
void void
rust_task::wakeup(rust_cond *from) { rust_task::wakeup(rust_cond *from) {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
A(sched, cond != NULL, "Cannot wake up unblocked task."); A(sched, cond != NULL, "Cannot wake up unblocked task.");
LOG(this, task, "Blocked on 0x%" PRIxPTR " woken up on 0x%" PRIxPTR, LOG(this, task, "Blocked on 0x%" PRIxPTR " woken up on 0x%" PRIxPTR,
@ -473,6 +475,7 @@ rust_task::wakeup(rust_cond *from) {
void void
rust_task::die() { rust_task::die() {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
transition(&sched->running_tasks, &sched->dead_tasks); transition(&sched->running_tasks, &sched->dead_tasks);
sched->lock.signal(); sched->lock.signal();
@ -535,6 +538,7 @@ void rust_task::on_wakeup(rust_task::wakeup_callback *callback) {
} }
rust_port_id rust_task::register_port(rust_port *port) { rust_port_id rust_task::register_port(rust_port *port) {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
rust_port_id id = next_port_id++; rust_port_id id = next_port_id++;
@ -543,11 +547,13 @@ rust_port_id rust_task::register_port(rust_port *port) {
} }
void rust_task::release_port(rust_port_id id) { void rust_task::release_port(rust_port_id id) {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
port_table.remove(id); port_table.remove(id);
} }
rust_port *rust_task::get_port_by_id(rust_port_id id) { rust_port *rust_task::get_port_by_id(rust_port_id id) {
I(sched, !lock.lock_held_by_current_thread());
scoped_lock with(lock); scoped_lock with(lock);
rust_port *port = NULL; rust_port *port = NULL;
port_table.get(id, &port); port_table.get(id, &port);
@ -571,6 +577,7 @@ rust_port *rust_task::get_port_by_chan_handle(chan_handle *handle) {
// to another. // to another.
const type_desc * const type_desc *
rust_task::release_alloc(void *alloc) { rust_task::release_alloc(void *alloc) {
I(sched, !lock.lock_held_by_current_thread());
lock.lock(); lock.lock();
assert(local_allocs.find(alloc) != local_allocs.end()); assert(local_allocs.find(alloc) != local_allocs.end());
@ -587,6 +594,7 @@ rust_task::release_alloc(void *alloc) {
// reparented to this one. // reparented to this one.
void void
rust_task::claim_alloc(void *alloc, const type_desc *tydesc) { rust_task::claim_alloc(void *alloc, const type_desc *tydesc) {
I(sched, !lock.lock_held_by_current_thread());
lock.lock(); lock.lock();
assert(local_allocs.find(alloc) == local_allocs.end()); assert(local_allocs.find(alloc) == local_allocs.end());