diff options
| author | Graydon Hoare <[email protected]> | 2010-08-10 13:26:00 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-08-10 13:26:00 -0700 |
| commit | dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec (patch) | |
| tree | c5f89fa72e9c28ced0a533a498d64eee30f26f3f /src/rt/rust_dom.h | |
| parent | Fix a deque size bookkeeping bug. (diff) | |
| parent | Add names to tasks and domains. These can either be an explicit literal string (diff) | |
| download | rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.tar.xz rust-dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec.zip | |
Merge commit 'jyasskin/work'
Conflicts:
src/rt/rust_dom.cpp
src/rt/rust_upcall.cpp
Diffstat (limited to 'src/rt/rust_dom.h')
| -rw-r--r-- | src/rt/rust_dom.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rt/rust_dom.h b/src/rt/rust_dom.h index 5a3278b9..3aaf635a 100644 --- a/src/rt/rust_dom.h +++ b/src/rt/rust_dom.h @@ -25,6 +25,7 @@ struct rust_dom rust_crate const *root_crate; rust_log _log; rust_srv *srv; + const char *const name; ptr_vec<rust_task> running_tasks; ptr_vec<rust_task> blocked_tasks; ptr_vec<rust_task> dead_tasks; @@ -44,7 +45,9 @@ struct rust_dom pthread_attr_t attr; #endif - rust_dom(rust_srv *srv, rust_crate const *root_crate); + // Only a pointer to 'name' is kept, so it must live as long as this + // domain. + rust_dom(rust_srv *srv, rust_crate const *root_crate, const char *name); ~rust_dom(); void activate(rust_task *task); |