Mercurial > hg > graal-compiler

comparison src/share/vm/memory/heap.cpp @ 12057:58fc8e2b7b6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 10 Oct 2013 17:22:25 +0200
parents 836a62f43af9 740e263c80c6
children d8041d695d19
comparison
equal deleted inserted replaced
12041:7e5cf369559f 12057:58fc8e2b7b6d
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
116 116
117 on_code_mapping(_memory.low(), _memory.committed_size()); 117 on_code_mapping(_memory.low(), _memory.committed_size());
118 _number_of_committed_segments = size_to_segments(_memory.committed_size()); 118 _number_of_committed_segments = size_to_segments(_memory.committed_size());
119 _number_of_reserved_segments = size_to_segments(_memory.reserved_size()); 119 _number_of_reserved_segments = size_to_segments(_memory.reserved_size());
120 assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking"); 120 assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
121 const size_t reserved_segments_alignment = MAX2((size_t)os::vm_page_size(), granularity);
122 const size_t reserved_segments_size = align_size_up(_number_of_reserved_segments, reserved_segments_alignment);
123 const size_t committed_segments_size = align_to_page_size(_number_of_committed_segments);
121 124
122 // reserve space for _segmap 125 // reserve space for _segmap
123 if (!_segmap.initialize(align_to_page_size(_number_of_reserved_segments), align_to_page_size(_number_of_committed_segments))) { 126 if (!_segmap.initialize(reserved_segments_size, committed_segments_size)) {
124 return false; 127 return false;
125 } 128 }
126 129
127 MemTracker::record_virtual_memory_type((address)_segmap.low_boundary(), mtCode); 130 MemTracker::record_virtual_memory_type((address)_segmap.low_boundary(), mtCode);
128 131