comparison src/share/vm/memory/allocation.hpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 989155e2d07a 4102b59539ce
children b8f261ba79c6
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
146 mtSymbol = 0x0900, // symbol 146 mtSymbol = 0x0900, // symbol
147 mtNMT = 0x0A00, // memory used by native memory tracking 147 mtNMT = 0x0A00, // memory used by native memory tracking
148 mtChunk = 0x0B00, // chunk that holds content of arenas 148 mtChunk = 0x0B00, // chunk that holds content of arenas
149 mtJavaHeap = 0x0C00, // Java heap 149 mtJavaHeap = 0x0C00, // Java heap
150 mtClassShared = 0x0D00, // class data sharing 150 mtClassShared = 0x0D00, // class data sharing
151 mt_number_of_types = 0x000D, // number of memory types (mtDontTrack 151 mtTest = 0x0E00, // Test type for verifying NMT
152 mt_number_of_types = 0x000E, // number of memory types (mtDontTrack
152 // is not included as validate type) 153 // is not included as validate type)
153 mtDontTrack = 0x0E00, // memory we do not or cannot track 154 mtDontTrack = 0x0F00, // memory we do not or cannot track
154 mt_masks = 0x7F00, 155 mt_masks = 0x7F00,
155 156
156 // object type mask 157 // object type mask
157 otArena = 0x0010, // an arena object 158 otArena = 0x0010, // an arena object
158 otNMTRecorder = 0x0020, // memory recorder object 159 otNMTRecorder = 0x0020, // memory recorder object