Mercurial > hg > graal-compiler
comparison src/share/vm/memory/heap.cpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 21 Aug 2012 10:39:19 +0200 |
parents | 3c21eee8ab4d d2a62e0f25eb |
children | e522a00b91aa |
comparison
equal
deleted
inserted
replaced
5891:fd8832ae511d | 6275:957c266d8bc5 |
---|---|
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "memory/heap.hpp" | 26 #include "memory/heap.hpp" |
27 #include "oops/oop.inline.hpp" | 27 #include "oops/oop.inline.hpp" |
28 #include "runtime/os.hpp" | 28 #include "runtime/os.hpp" |
29 | 29 #include "services/memTracker.hpp" |
30 | 30 |
31 size_t CodeHeap::header_size() { | 31 size_t CodeHeap::header_size() { |
32 return sizeof(HeapBlock); | 32 return sizeof(HeapBlock); |
33 } | 33 } |
34 | 34 |
128 | 128 |
129 // reserve space for _segmap | 129 // reserve space for _segmap |
130 if (!_segmap.initialize(align_to_allocation_size(_number_of_reserved_segments), align_to_allocation_size(_number_of_committed_segments))) { | 130 if (!_segmap.initialize(align_to_allocation_size(_number_of_reserved_segments), align_to_allocation_size(_number_of_committed_segments))) { |
131 return false; | 131 return false; |
132 } | 132 } |
133 | |
134 MemTracker::record_virtual_memory_type((address)_segmap.low_boundary(), mtCode); | |
135 | |
133 assert(_segmap.committed_size() >= (size_t) _number_of_committed_segments, "could not commit enough space for segment map"); | 136 assert(_segmap.committed_size() >= (size_t) _number_of_committed_segments, "could not commit enough space for segment map"); |
134 assert(_segmap.reserved_size() >= (size_t) _number_of_reserved_segments , "could not reserve enough space for segment map"); | 137 assert(_segmap.reserved_size() >= (size_t) _number_of_reserved_segments , "could not reserve enough space for segment map"); |
135 assert(_segmap.reserved_size() >= _segmap.committed_size() , "just checking"); | 138 assert(_segmap.reserved_size() >= _segmap.committed_size() , "just checking"); |
136 | 139 |
137 // initialize remaining instance variables | 140 // initialize remaining instance variables |