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_task.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_task.h')
| -rw-r--r-- | src/rt/rust_task.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h index b657592a..27495e2c 100644 --- a/src/rt/rust_task.h +++ b/src/rt/rust_task.h @@ -21,6 +21,7 @@ rust_task : public maybe_proxy<rust_task>, rust_crate_cache *cache; // Fields known only to the runtime. + const char *const name; ptr_vec<rust_task> *state; rust_cond *cond; rust_task *supervisor; // Parent-link for failure propagation. @@ -41,8 +42,10 @@ rust_task : public maybe_proxy<rust_task>, rust_alarm alarm; + // Only a pointer to 'name' is kept, so it must live as long as this task. rust_task(rust_dom *dom, - rust_task *spawner); + rust_task *spawner, + const char *name); ~rust_task(); void start(uintptr_t exit_task_glue, |