mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rt: cleanup passing around of rust_env

Browse Source
This commit is contained in:
Jon Morton 2012-04-02 03:11:58 -05:00
parent bee45f0ef0
commit bcb9269d84
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rt/rust_kernel.cpp
View File

@ -11,7 +11,7 @@
rust_kernel::rust_kernel(rust_env *env) : rust_kernel::rust_kernel(rust_env *env) :
_region(env, true), _region(env, true),
_log(env, NULL), _log(NULL),
max_task_id(0), max_task_id(0),
max_port_id(0), max_port_id(0),
rval(0), rval(0),

3
src/rt/rust_log.cpp
View File

@ -40,8 +40,7 @@ log_console_off(rust_env *env) {
} }
} }
rust_log::rust_log(rust_env *env, rust_sched_loop *sched_loop) : rust_log::rust_log(rust_sched_loop *sched_loop) :
_env(env),
_sched_loop(sched_loop) { _sched_loop(sched_loop) {
} }

3
src/rt/rust_log.h
View File

@ -40,7 +40,7 @@ struct rust_task;
class rust_log { class rust_log {
public: public:
rust_log(rust_env *env, rust_sched_loop *sched_loop); rust_log(rust_sched_loop *sched_loop);
virtual ~rust_log(); virtual ~rust_log();
void trace_ln(rust_task *task, uint32_t level, char *message); void trace_ln(rust_task *task, uint32_t level, char *message);
@ -48,7 +48,6 @@ public:
bool is_tracing(uint32_t type_bits); bool is_tracing(uint32_t type_bits);
private: private:
rust_env *_env;
rust_sched_loop *_sched_loop; rust_sched_loop *_sched_loop;
bool _use_labels; bool _use_labels;
void trace_ln(rust_task *task, char *message); void trace_ln(rust_task *task, char *message);

7
src/rt/rust_sched_loop.cpp
View File

@ -18,7 +18,7 @@ const size_t C_STACK_SIZE = 1024*1024;
bool rust_sched_loop::tls_initialized = false; bool rust_sched_loop::tls_initialized = false;
rust_sched_loop::rust_sched_loop(rust_scheduler *sched,int id) : rust_sched_loop::rust_sched_loop(rust_scheduler *sched,int id) :
_log(env, this), _log(this),
id(id), id(id),
should_exit(false), should_exit(false),
cached_c_stack(NULL), cached_c_stack(NULL),
@ -28,8 +28,7 @@ rust_sched_loop::rust_sched_loop(rust_scheduler *sched,int id) :
sched(sched), sched(sched),
log_lvl(log_debug), log_lvl(log_debug),
min_stack_size(kernel->env->min_stack_size), min_stack_size(kernel->env->min_stack_size),
env(kernel->env), local_region(kernel->env, false),
local_region(env, false),
// TODO: calculate a per scheduler name. // TODO: calculate a per scheduler name.
name("main") name("main")
{ {
@ -277,7 +276,7 @@ rust_sched_loop::create_task(rust_task *spawner, const char *name) {
rust_task *task = rust_task *task =
new (this->kernel, "rust_task") new (this->kernel, "rust_task")
rust_task (this, task_state_newborn, rust_task (this, task_state_newborn,
spawner, name, env->min_stack_size); spawner, name, kernel->env->min_stack_size);
DLOG(this, task, "created task: " PTR ", spawner: %s, name: %s", DLOG(this, task, "created task: " PTR ", spawner: %s, name: %s",
task, spawner ? spawner->name : "null", name); task, spawner ? spawner->name : "null", name);

1
src/rt/rust_sched_loop.h
View File

@ -79,7 +79,6 @@ public:
uint32_t log_lvl; uint32_t log_lvl;
size_t min_stack_size; size_t min_stack_size;
rust_env *env;
memory_region local_region; memory_region local_region;
randctx rctx; randctx rctx;

2
src/rt/rust_task.cpp
View File

@ -513,7 +513,7 @@ rust_task::new_stack(size_t requested_sz) {
size_t rust_stk_sz = get_next_stack_size(min_sz, size_t rust_stk_sz = get_next_stack_size(min_sz,
current_sz, requested_sz); current_sz, requested_sz);
if (total_stack_sz + rust_stk_sz > sched_loop->env->max_stack_size) { if (total_stack_sz + rust_stk_sz > kernel->env->max_stack_size) {
LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this); LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this);
fail(); fail();
} }