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

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

Issue 12580005: Fail with fatal error instead of segmentation fault if virtual memory allocation fails. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « runtime/vm/scavenger.cc ('k') | 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/virtual_memory.h" 5 #include "vm/virtual_memory.h"
6 6
7 #include "platform/assert.h" 7 #include "platform/assert.h"
8 #include "platform/utils.h" 8 #include "platform/utils.h"
9 9
10 namespace dart { 10 namespace dart {
11 11
12 VirtualMemory* VirtualMemory::ReserveAligned(intptr_t size, 12 VirtualMemory* VirtualMemory::ReserveAligned(intptr_t size,
13 intptr_t alignment) { 13 intptr_t alignment) {
14 ASSERT((size & (PageSize() - 1)) == 0); 14 ASSERT((size & (PageSize() - 1)) == 0);
15 ASSERT(Utils::IsPowerOfTwo(alignment)); 15 ASSERT(Utils::IsPowerOfTwo(alignment));
16 ASSERT(alignment >= PageSize()); 16 ASSERT(alignment >= PageSize());
17 VirtualMemory* result = VirtualMemory::Reserve(size + alignment); 17 VirtualMemory* result = VirtualMemory::Reserve(size + alignment);
18 if (result == NULL) {
19 FATAL("Out of memory.\n");
20 }
18 uword start = result->start(); 21 uword start = result->start();
19 uword real_start = (start + alignment - 1) & ~(alignment - 1); 22 uword real_start = (start + alignment - 1) & ~(alignment - 1);
20 result->Truncate(real_start, size); 23 result->Truncate(real_start, size);
21 return result; 24 return result;
22 } 25 }
23 26
24 27
25 void VirtualMemory::Truncate(uword new_start, intptr_t new_size) { 28 void VirtualMemory::Truncate(uword new_start, intptr_t new_size) {
26 ASSERT(new_start >= start()); 29 ASSERT(new_start >= start());
27 ASSERT((new_size & (PageSize() - 1)) == 0); 30 ASSERT((new_size & (PageSize() - 1)) == 0);
28 if (new_start > start()) { 31 if (new_start > start()) {
29 uword split = new_start - start(); 32 uword split = new_start - start();
30 ASSERT((split & (PageSize() - 1)) == 0); 33 ASSERT((split & (PageSize() - 1)) == 0);
31 FreeSubSegment(address(), split); 34 FreeSubSegment(address(), split);
32 region_.Subregion(region_, split, size() - split); 35 region_.Subregion(region_, split, size() - split);
33 } 36 }
34 ASSERT(new_size <= size()); 37 ASSERT(new_size <= size());
35 FreeSubSegment(reinterpret_cast<void*>(start() + new_size), 38 FreeSubSegment(reinterpret_cast<void*>(start() + new_size),
36 size() - new_size); 39 size() - new_size);
37 region_.Subregion(region_, 0, new_size); 40 region_.Subregion(region_, 0, new_size);
38 } 41 }
39 42
40 } // namespace dart 43 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/scavenger.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698