Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: runtime/vm/virtual_memory_win.cc

Issue 644453003: Simplify VirtualMemory by removing unused ReserveAligned method. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_WINDOWS) 6 #if defined(TARGET_OS_WINDOWS)
7 7
8 #include "vm/virtual_memory.h" 8 #include "vm/virtual_memory.h"
9 9
10 #include "platform/assert.h" 10 #include "platform/assert.h"
11 #include "vm/os.h" 11 #include "vm/os.h"
12 12
13 namespace dart { 13 namespace dart {
14 14
15 uword VirtualMemory::page_size_ = 0; 15 uword VirtualMemory::page_size_ = 0;
16 16
17 17
18 void VirtualMemory::InitOnce() { 18 void VirtualMemory::InitOnce() {
19 SYSTEM_INFO info; 19 SYSTEM_INFO info;
20 GetSystemInfo(&info); 20 GetSystemInfo(&info);
21 page_size_ = info.dwPageSize; 21 page_size_ = info.dwPageSize;
22 } 22 }
23 23
24 24
25 VirtualMemory* VirtualMemory::Reserve(intptr_t size) { 25 VirtualMemory* VirtualMemory::ReserveInternal(intptr_t size) {
26 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS); 26 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS);
27 if (address == NULL) { 27 if (address == NULL) {
28 return NULL; 28 return NULL;
29 } 29 }
30 MemoryRegion region(address, size); 30 MemoryRegion region(address, size);
31 return new VirtualMemory(region, address); 31 return new VirtualMemory(region, address);
32 } 32 }
33 33
34 34
35 VirtualMemory::~VirtualMemory() { 35 VirtualMemory::~VirtualMemory() {
36 if (size() == 0) { 36 if (reserved_size_ == 0) {
37 return; 37 return;
38 } 38 }
39 39 if (VirtualFree(address(), 0, MEM_RELEASE) == 0) {
40 // Since sub-segments are not freed, free the entire virtual segment
41 // here by passing the originally reserved pointer to VirtualFree.
42 ASSERT(reserved_pointer_ != NULL);
43 if (VirtualFree(reserved_pointer_, 0, MEM_RELEASE) == 0) {
44 FATAL("VirtualFree failed"); 40 FATAL("VirtualFree failed");
45 } 41 }
46 } 42 }
47 43
48 44
49 void VirtualMemory::FreeSubSegment(void* address, intptr_t size) { 45 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
50 // On Windows only the entire segment returned by VirtualAlloc 46 // On Windows only the entire segment returned by VirtualAlloc
51 // can be freed. Therefore we will have to waste these unused 47 // can be freed. Therefore we will have to waste these unused
52 // virtual memory sub-segments. 48 // virtual memory sub-segments.
49 return false;
53 } 50 }
54 51
55 52
56 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { 53 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) {
57 ASSERT(Contains(addr)); 54 ASSERT(Contains(addr));
58 ASSERT(Contains(addr + size) || (addr + size == end())); 55 ASSERT(Contains(addr + size) || (addr + size == end()));
59 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; 56 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
60 if (VirtualAlloc(address(), size, MEM_COMMIT, prot) == NULL) { 57 if (VirtualAlloc(address(), size, MEM_COMMIT, prot) == NULL) {
61 return false; 58 return false;
62 } 59 }
(...skipping 27 matching lines...) Expand all
90 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), 87 bool result = VirtualProtect(reinterpret_cast<void*>(page_address),
91 end_address - page_address, 88 end_address - page_address,
92 prot, 89 prot,
93 &old_prot); 90 &old_prot);
94 return result; 91 return result;
95 } 92 }
96 93
97 } // namespace dart 94 } // namespace dart
98 95
99 #endif // defined(TARGET_OS_WINDOWS) 96 #endif // defined(TARGET_OS_WINDOWS)
OLDNEW
« runtime/vm/virtual_memory.h ('K') | « runtime/vm/virtual_memory_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698