From 128a8b6ed500f74fa802aa9749b3b7a19ebfffc9 Mon Sep 17 00:00:00 2001 From: Jon Morton Date: Sun, 1 Apr 2012 22:18:40 -0500 Subject: remove rust_srv --- src/rt/rust_kernel.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/rt/rust_kernel.cpp') diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index 8c2b0030bce..b52166e469a 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -9,16 +9,15 @@ #define KLOG_ERR_(field, ...) \ KLOG_LVL(this, field, log_err, __VA_ARGS__) -rust_kernel::rust_kernel(rust_srv *srv) : - _region(srv, true), - _log(srv, NULL), - srv(srv), +rust_kernel::rust_kernel(rust_env *env) : + _region(env, true), + _log(env, NULL), max_task_id(0), max_port_id(0), rval(0), max_sched_id(0), sched_reaper(this), - env(srv->env) + env(env) { } @@ -69,7 +68,7 @@ rust_kernel::create_scheduler(size_t num_threads) { id = max_sched_id++; assert(id != INTPTR_MAX && "Hit the maximum scheduler id"); sched = new (this, "rust_scheduler") - rust_scheduler(this, srv, num_threads, id); + rust_scheduler(this, num_threads, id); bool is_new = sched_table .insert(std::pair(id, sched)).second; -- cgit 1.4.1-3-g733a5