diff options
| author | Michael Bebenita <mbebenita@mozilla.com> | 2010-09-07 18:39:07 -0700 |
|---|---|---|
| committer | Michael Bebenita <mbebenita@mozilla.com> | 2010-09-07 18:44:12 -0700 |
| commit | de611a309006f0976bc9a579eb1087e7a89f79a7 (patch) | |
| tree | cd30b33ab1986c0cc84e0fc0743593bd99b0caaa /src/rt/memory_region.cpp | |
| parent | a6aebdaedd4abb95b040c9cd09cfdb6b9b940789 (diff) | |
| download | rust-de611a309006f0976bc9a579eb1087e7a89f79a7.tar.gz rust-de611a309006f0976bc9a579eb1087e7a89f79a7.zip | |
Lots of design changes around proxies and message passing. Made it so that domains can only talk to other domains via handles, and with the help of the rust_kernel.
Diffstat (limited to 'src/rt/memory_region.cpp')
| -rw-r--r-- | src/rt/memory_region.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rt/memory_region.cpp b/src/rt/memory_region.cpp index 797a7c1d669..2f841935c11 100644 --- a/src/rt/memory_region.cpp +++ b/src/rt/memory_region.cpp @@ -1,7 +1,3 @@ -/* - * - */ - #include "rust_internal.h" #include "memory_region.h" @@ -20,6 +16,7 @@ memory_region::memory_region(memory_region *parent) : } void memory_region::free(void *mem) { + // printf("free: ptr 0x%" PRIxPTR"\n", (uintptr_t) mem); if (_synchronized) { _lock.lock(); } #ifdef TRACK_ALLOCATIONS if (_allocation_list.replace(mem, NULL) == false) { @@ -34,7 +31,6 @@ void memory_region::free(void *mem) { _live_allocations--; _srv->free(mem); if (_synchronized) { _lock.unlock(); } - } void * @@ -63,6 +59,7 @@ memory_region::malloc(size_t size) { #ifdef TRACK_ALLOCATIONS _allocation_list.append(mem); #endif + // printf("malloc: ptr 0x%" PRIxPTR "\n", (uintptr_t) mem); if (_synchronized) { _lock.unlock(); } return mem; } |
