From e43c5bdc6b47e8dd5e2ddcd6cf57fec79388523a Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sun, 13 Jan 2013 16:53:13 -0800 Subject: Rewrite the exchange allocator to work without an active scheduler. #4457 --- src/rt/rust_kernel.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/rt/rust_kernel.h') diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h index c3d5a5a19bb..11af02dace4 100644 --- a/src/rt/rust_kernel.h +++ b/src/rt/rust_kernel.h @@ -45,11 +45,12 @@ #include #include -#include "memory_region.h" +#include "rust_exchange_alloc.h" #include "rust_log.h" #include "rust_sched_reaper.h" #include "rust_type.h" #include "util/hash_map.h" +#include "sync/lock_and_signal.h" class rust_scheduler; class rust_sched_driver; @@ -71,7 +72,7 @@ struct exit_functions { }; class rust_kernel { - memory_region _region; + rust_exchange_alloc exchange_alloc; rust_log _log; // The next task id @@ -135,7 +136,7 @@ public: void *calloc(size_t size, const char *tag); void *realloc(void *mem, size_t size); void free(void *mem); - memory_region *region() { return &_region; } + rust_exchange_alloc *region() { return &exchange_alloc; } void fail(); -- cgit 1.4.1-3-g733a5