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

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

Issue 1710443003: Fix background compilation: allocate stubs at safepoint (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: d Created 4 years, 10 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
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_MACOS) 6 #if defined(TARGET_OS_MACOS)
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
11 #include <unistd.h> // NOLINT 11 #include <unistd.h> // NOLINT
12 12
13 #include "platform/assert.h" 13 #include "platform/assert.h"
14 #include "platform/utils.h" 14 #include "platform/utils.h"
15 15
16 #include "vm/isolate.h"
17 #include "vm/thread.h"
siva 2016/02/17 21:07:49 These header files are not included in the other O
srdjan 2016/02/17 21:15:15 Removed thread.h; added it to other OS-s as well.
18
16 namespace dart { 19 namespace dart {
17 20
18 // standard MAP_FAILED causes "error: use of old-style cast" as it 21 // standard MAP_FAILED causes "error: use of old-style cast" as it
19 // defines MAP_FAILED as ((void *) -1) 22 // defines MAP_FAILED as ((void *) -1)
20 #undef MAP_FAILED 23 #undef MAP_FAILED
21 #define MAP_FAILED reinterpret_cast<void*>(-1) 24 #define MAP_FAILED reinterpret_cast<void*>(-1)
22 25
23 uword VirtualMemory::page_size_ = 0; 26 uword VirtualMemory::page_size_ = 0;
24 27
25 28
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 MAP_PRIVATE | MAP_ANON | MAP_FIXED, 76 MAP_PRIVATE | MAP_ANON | MAP_FIXED,
74 -1, 0); 77 -1, 0);
75 if (address == MAP_FAILED) { 78 if (address == MAP_FAILED) {
76 return false; 79 return false;
77 } 80 }
78 return true; 81 return true;
79 } 82 }
80 83
81 84
82 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) { 85 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) {
86 ASSERT(Thread::Current()->IsMutatorThread() ||
87 Isolate::Current()->mutator_thread()->IsAtSafepoint());
83 uword start_address = reinterpret_cast<uword>(address); 88 uword start_address = reinterpret_cast<uword>(address);
84 uword end_address = start_address + size; 89 uword end_address = start_address + size;
85 uword page_address = Utils::RoundDown(start_address, PageSize()); 90 uword page_address = Utils::RoundDown(start_address, PageSize());
86 int prot = 0; 91 int prot = 0;
87 switch (mode) { 92 switch (mode) {
88 case kNoAccess: 93 case kNoAccess:
89 prot = PROT_NONE; 94 prot = PROT_NONE;
90 break; 95 break;
91 case kReadOnly: 96 case kReadOnly:
92 prot = PROT_READ; 97 prot = PROT_READ;
93 break; 98 break;
94 case kReadWrite: 99 case kReadWrite:
95 prot = PROT_READ | PROT_WRITE; 100 prot = PROT_READ | PROT_WRITE;
96 break; 101 break;
97 case kReadExecute: 102 case kReadExecute:
98 prot = PROT_READ | PROT_EXEC; 103 prot = PROT_READ | PROT_EXEC;
99 break; 104 break;
100 case kReadWriteExecute: 105 case kReadWriteExecute:
101 prot = PROT_READ | PROT_WRITE | PROT_EXEC; 106 prot = PROT_READ | PROT_WRITE | PROT_EXEC;
102 break; 107 break;
103 } 108 }
104 return (mprotect(reinterpret_cast<void*>(page_address), 109 return (mprotect(reinterpret_cast<void*>(page_address),
105 end_address - page_address, 110 end_address - page_address,
106 prot) == 0); 111 prot) == 0);
107 } 112 }
108 113
109 } // namespace dart 114 } // namespace dart
110 115
111 #endif // defined(TARGET_OS_MACOS) 116 #endif // defined(TARGET_OS_MACOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698