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

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

Issue 1406013004: Fixes shutdown crashes. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: address comments Created 5 years, 1 month 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 | « runtime/vm/virtual_memory_android.cc ('k') | runtime/vm/virtual_memory_macos.cc » ('j') | 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_LINUX) 6 #if defined(TARGET_OS_LINUX)
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 return; 45 return;
46 } 46 }
47 47
48 if (munmap(address, size) != 0) { 48 if (munmap(address, size) != 0) {
49 FATAL("munmap failed\n"); 49 FATAL("munmap failed\n");
50 } 50 }
51 } 51 }
52 52
53 53
54 VirtualMemory::~VirtualMemory() { 54 VirtualMemory::~VirtualMemory() {
55 unmap(address(), reserved_size_); 55 if (!embedder_allocated()) {
56 unmap(address(), reserved_size_);
57 }
56 } 58 }
57 59
58 60
59 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { 61 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
60 unmap(address, size); 62 unmap(address, size);
61 return true; 63 return true;
62 } 64 }
63 65
64 66
65 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { 67 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 102 }
101 return (mprotect(reinterpret_cast<void*>(page_address), 103 return (mprotect(reinterpret_cast<void*>(page_address),
102 end_address - page_address, 104 end_address - page_address,
103 prot) == 0); 105 prot) == 0);
104 } 106 }
105 107
106 108
107 } // namespace dart 109 } // namespace dart
108 110
109 #endif // defined(TARGET_OS_LINUX) 111 #endif // defined(TARGET_OS_LINUX)
OLDNEW
« no previous file with comments | « runtime/vm/virtual_memory_android.cc ('k') | runtime/vm/virtual_memory_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698