OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/globals.h" | 5 #include "vm/globals.h" |
6 #if defined(TARGET_OS_ANDROID) | 6 #if defined(TARGET_OS_ANDROID) |
7 | 7 |
8 #include "vm/virtual_memory.h" | 8 #include "vm/virtual_memory.h" |
9 | 9 |
10 #include <sys/mman.h> // NOLINT | 10 #include <sys/mman.h> // NOLINT |
(...skipping 10 matching lines...) Expand all Loading... |
21 #define MAP_FAILED reinterpret_cast<void*>(-1) | 21 #define MAP_FAILED reinterpret_cast<void*>(-1) |
22 | 22 |
23 uword VirtualMemory::page_size_ = 0; | 23 uword VirtualMemory::page_size_ = 0; |
24 | 24 |
25 | 25 |
26 void VirtualMemory::InitOnce() { | 26 void VirtualMemory::InitOnce() { |
27 page_size_ = getpagesize(); | 27 page_size_ = getpagesize(); |
28 } | 28 } |
29 | 29 |
30 | 30 |
31 VirtualMemory* VirtualMemory::Reserve(intptr_t size) { | 31 VirtualMemory* VirtualMemory::ReserveInternal(intptr_t size) { |
32 // TODO(4408): use ashmem instead of anonymous memory. | 32 // TODO(4408): use ashmem instead of anonymous memory. |
33 void* address = mmap(NULL, size, PROT_NONE, | 33 void* address = mmap(NULL, size, PROT_NONE, |
34 MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, | 34 MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, |
35 -1, 0); | 35 -1, 0); |
36 if (address == MAP_FAILED) { | 36 if (address == MAP_FAILED) { |
37 return NULL; | 37 return NULL; |
38 } | 38 } |
39 MemoryRegion region(address, size); | 39 MemoryRegion region(address, size); |
40 return new VirtualMemory(region, NULL); | 40 return new VirtualMemory(region); |
41 } | 41 } |
42 | 42 |
43 | 43 |
44 static void unmap(void* address, intptr_t size) { | 44 static void unmap(void* address, intptr_t size) { |
45 if (size == 0) { | 45 if (size == 0) { |
46 return; | 46 return; |
47 } | 47 } |
48 | 48 |
49 if (munmap(address, size) != 0) { | 49 if (munmap(address, size) != 0) { |
50 FATAL("munmap failed\n"); | 50 FATAL("munmap failed\n"); |
51 } | 51 } |
52 } | 52 } |
53 | 53 |
54 | 54 |
55 VirtualMemory::~VirtualMemory() { | 55 VirtualMemory::~VirtualMemory() { |
56 unmap(address(), size()); | 56 unmap(address(), reserved_size_); |
57 } | 57 } |
58 | 58 |
59 | 59 |
60 void VirtualMemory::FreeSubSegment(void* address, intptr_t size) { | 60 void VirtualMemory::FreeSubSegment(void* address, intptr_t size) { |
61 unmap(address, size); | 61 unmap(address, size); |
| 62 return true; |
62 } | 63 } |
63 | 64 |
64 | 65 |
65 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 66 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { |
66 ASSERT(Contains(addr)); | 67 ASSERT(Contains(addr)); |
67 ASSERT(Contains(addr + size) || (addr + size == end())); | 68 ASSERT(Contains(addr + size) || (addr + size == end())); |
68 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); | 69 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); |
69 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, | 70 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, |
70 MAP_PRIVATE | MAP_ANON | MAP_FIXED, | 71 MAP_PRIVATE | MAP_ANON | MAP_FIXED, |
71 -1, 0); | 72 -1, 0); |
(...skipping 27 matching lines...) Expand all Loading... |
99 break; | 100 break; |
100 } | 101 } |
101 return (mprotect(reinterpret_cast<void*>(page_address), | 102 return (mprotect(reinterpret_cast<void*>(page_address), |
102 end_address - page_address, | 103 end_address - page_address, |
103 prot) == 0); | 104 prot) == 0); |
104 } | 105 } |
105 | 106 |
106 } // namespace dart | 107 } // namespace dart |
107 | 108 |
108 #endif // defined(TARGET_OS_ANDROID) | 109 #endif // defined(TARGET_OS_ANDROID) |
OLD | NEW |