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

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

Issue 2191723002: Fix race condition with HasMutatorThread that was being used without a lock. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Address self review comments. Created 4 years, 4 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
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 -1, 0); 76 -1, 0);
77 if (address == MAP_FAILED) { 77 if (address == MAP_FAILED) {
78 return false; 78 return false;
79 } 79 }
80 return true; 80 return true;
81 } 81 }
82 82
83 83
84 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) { 84 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) {
85 ASSERT(Thread::Current()->IsMutatorThread() || 85 ASSERT(Thread::Current()->IsMutatorThread() ||
86 !Isolate::Current()->HasMutatorThread() ||
87 Isolate::Current()->mutator_thread()->IsAtSafepoint()); 86 Isolate::Current()->mutator_thread()->IsAtSafepoint());
88 uword start_address = reinterpret_cast<uword>(address); 87 uword start_address = reinterpret_cast<uword>(address);
89 uword end_address = start_address + size; 88 uword end_address = start_address + size;
90 uword page_address = Utils::RoundDown(start_address, PageSize()); 89 uword page_address = Utils::RoundDown(start_address, PageSize());
91 int prot = 0; 90 int prot = 0;
92 switch (mode) { 91 switch (mode) {
93 case kNoAccess: 92 case kNoAccess:
94 prot = PROT_NONE; 93 prot = PROT_NONE;
95 break; 94 break;
96 case kReadOnly: 95 case kReadOnly:
(...skipping 10 matching lines...) Expand all
107 break; 106 break;
108 } 107 }
109 return (mprotect(reinterpret_cast<void*>(page_address), 108 return (mprotect(reinterpret_cast<void*>(page_address),
110 end_address - page_address, 109 end_address - page_address,
111 prot) == 0); 110 prot) == 0);
112 } 111 }
113 112
114 } // namespace dart 113 } // namespace dart
115 114
116 #endif // defined(TARGET_OS_MACOS) 115 #endif // defined(TARGET_OS_MACOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698