diff options
| author | Michael Bebenita <[email protected]> | 2010-08-17 23:40:07 -0700 |
|---|---|---|
| committer | Michael Bebenita <[email protected]> | 2010-08-17 23:49:57 -0700 |
| commit | 2c1ec6771bd09266308686ab13ca32e2aa73da49 (patch) | |
| tree | acbcae9da89c0f6d37fccdf8b4091f003e798683 /src/rt/memory.h | |
| parent | Add a "special" rust_log flag to be used for debugging in cases where the ful... (diff) | |
| download | rust-2c1ec6771bd09266308686ab13ca32e2aa73da49.tar.xz rust-2c1ec6771bd09266308686ab13ca32e2aa73da49.zip | |
Lots of changes around memory managment in the Runtime. Added memory regions and fixed race caused by calling rust_srv::malloc() from multiple threads when sending messages.
Diffstat (limited to 'src/rt/memory.h')
| -rw-r--r-- | src/rt/memory.h | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/rt/memory.h b/src/rt/memory.h new file mode 100644 index 00000000..22bc15d3 --- /dev/null +++ b/src/rt/memory.h @@ -0,0 +1,60 @@ +/* + * + */ + +#ifndef MEMORY_H +#define MEMORY_H + + +inline void *operator new(size_t size, void *mem) { + return mem; +} + +inline void *operator new(size_t size, rust_dom *dom) { + return dom->malloc(size, memory_region::LOCAL); +} + +inline void *operator new[](size_t size, rust_dom *dom) { + return dom->malloc(size, memory_region::LOCAL); +} + +inline void *operator new(size_t size, rust_dom &dom) { + return dom.malloc(size, memory_region::LOCAL); +} + +inline void *operator new[](size_t size, rust_dom &dom) { + return dom.malloc(size, memory_region::LOCAL); +} + +inline void *operator new(size_t size, rust_dom *dom, + memory_region::memory_region_type type) { + return dom->malloc(size, type); +} + +inline void *operator new[](size_t size, rust_dom *dom, + memory_region::memory_region_type type) { + return dom->malloc(size, type); +} + +inline void *operator new(size_t size, rust_dom &dom, + memory_region::memory_region_type type) { + return dom.malloc(size, type); +} + +inline void *operator new[](size_t size, rust_dom &dom, + memory_region::memory_region_type type) { + return dom.malloc(size, type); +} + +inline void operator delete(void *mem, rust_dom *dom) { + dom->free(mem, memory_region::LOCAL); + return; +} + +inline void operator delete(void *mem, rust_dom *dom, + memory_region::memory_region_type type) { + dom->free(mem, type); + return; +} + +#endif /* MEMORY_H */ |