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

Side by Side Diff: runtime/vm/virtual_memory_linux.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_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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 -1, 0); 75 -1, 0);
76 if (address == MAP_FAILED) { 76 if (address == MAP_FAILED) {
77 return false; 77 return false;
78 } 78 }
79 return true; 79 return true;
80 } 80 }
81 81
82 82
83 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) { 83 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) {
84 ASSERT(Thread::Current()->IsMutatorThread() || 84 ASSERT(Thread::Current()->IsMutatorThread() ||
85 !Isolate::Current()->HasMutatorThread() ||
86 Isolate::Current()->mutator_thread()->IsAtSafepoint()); 85 Isolate::Current()->mutator_thread()->IsAtSafepoint());
87 uword start_address = reinterpret_cast<uword>(address); 86 uword start_address = reinterpret_cast<uword>(address);
88 uword end_address = start_address + size; 87 uword end_address = start_address + size;
89 uword page_address = Utils::RoundDown(start_address, PageSize()); 88 uword page_address = Utils::RoundDown(start_address, PageSize());
90 int prot = 0; 89 int prot = 0;
91 switch (mode) { 90 switch (mode) {
92 case kNoAccess: 91 case kNoAccess:
93 prot = PROT_NONE; 92 prot = PROT_NONE;
94 break; 93 break;
95 case kReadOnly: 94 case kReadOnly:
(...skipping 11 matching lines...) Expand all
107 } 106 }
108 return (mprotect(reinterpret_cast<void*>(page_address), 107 return (mprotect(reinterpret_cast<void*>(page_address),
109 end_address - page_address, 108 end_address - page_address,
110 prot) == 0); 109 prot) == 0);
111 } 110 }
112 111
113 112
114 } // namespace dart 113 } // namespace dart
115 114
116 #endif // defined(TARGET_OS_LINUX) 115 #endif // defined(TARGET_OS_LINUX)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698