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

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

Issue 2420853002: [windows] Revert virtual memory changes (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 17 matching lines...) Expand all
28 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS); 28 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS);
29 if (address == NULL) { 29 if (address == NULL) {
30 return NULL; 30 return NULL;
31 } 31 }
32 MemoryRegion region(address, size); 32 MemoryRegion region(address, size);
33 return new VirtualMemory(region); 33 return new VirtualMemory(region);
34 } 34 }
35 35
36 36
37 VirtualMemory::~VirtualMemory() { 37 VirtualMemory::~VirtualMemory() {
38 if (embedder_allocated()) { 38 if (embedder_allocated() || (reserved_size_ == 0)) {
39 return; 39 return;
40 } 40 }
41 if (VirtualFree(address(), 0, MEM_RELEASE) == 0) { 41 if (VirtualFree(address(), 0, MEM_RELEASE) == 0) {
42 FATAL1("VirtualFree failed: Error code %d\n", GetLastError()); 42 FATAL("VirtualFree failed");
43 } 43 }
44 } 44 }
45 45
46 46
47 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { 47 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
48 if (VirtualFree(address, size, MEM_DECOMMIT) == 0) { 48 // On Windows only the entire segment returned by VirtualAlloc
49 FATAL1("VirtualFree failed: Error code %d\n", GetLastError()); 49 // can be freed. Therefore we will have to waste these unused
50 } 50 // virtual memory sub-segments.
51 return true; 51 return false;
52 } 52 }
53 53
54 54
55 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { 55 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) {
56 ASSERT(Contains(addr)); 56 ASSERT(Contains(addr));
57 ASSERT(Contains(addr + size) || (addr + size == end())); 57 ASSERT(Contains(addr + size) || (addr + size == end()));
58 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; 58 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
59 if (VirtualAlloc(reinterpret_cast<void*>(addr), size, MEM_COMMIT, prot) == 59 if (VirtualAlloc(reinterpret_cast<void*>(addr), size, MEM_COMMIT, prot) ==
60 NULL) { 60 NULL) {
61 return false; 61 return false;
(...skipping 30 matching lines...) Expand all
92 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), 92 bool result = VirtualProtect(reinterpret_cast<void*>(page_address),
93 end_address - page_address, 93 end_address - page_address,
94 prot, 94 prot,
95 &old_prot); 95 &old_prot);
96 return result; 96 return result;
97 } 97 }
98 98
99 } // namespace dart 99 } // namespace dart
100 100
101 #endif // defined(TARGET_OS_WINDOWS) 101 #endif // defined(TARGET_OS_WINDOWS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698