comparison src/share/vm/memory/allocation.hpp @ 8506:c3657d00e343

-Merge with tip
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Thu, 21 Mar 2013 14:11:13 +0100
parents b8f261ba79c6
children 89e4d67fdd2a
comparison
equal deleted inserted replaced
8505:dee7c8b578c7 8506:c3657d00e343
31 #ifdef COMPILER1 31 #ifdef COMPILER1
32 #include "c1/c1_globals.hpp" 32 #include "c1/c1_globals.hpp"
33 #endif 33 #endif
34 #ifdef COMPILER2 34 #ifdef COMPILER2
35 #include "opto/c2_globals.hpp" 35 #include "opto/c2_globals.hpp"
36 #endif
37 #ifdef GRAAL
38 #include "graal/graalGlobals.hpp"
39 #endif 36 #endif
40 37
41 #include <new> 38 #include <new>
42 39
43 #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1) 40 #define ARENA_ALIGN_M1 (((size_t)(ARENA_AMALLOC_ALIGNMENT)) - 1)
146 mtSymbol = 0x0900, // symbol 143 mtSymbol = 0x0900, // symbol
147 mtNMT = 0x0A00, // memory used by native memory tracking 144 mtNMT = 0x0A00, // memory used by native memory tracking
148 mtChunk = 0x0B00, // chunk that holds content of arenas 145 mtChunk = 0x0B00, // chunk that holds content of arenas
149 mtJavaHeap = 0x0C00, // Java heap 146 mtJavaHeap = 0x0C00, // Java heap
150 mtClassShared = 0x0D00, // class data sharing 147 mtClassShared = 0x0D00, // class data sharing
151 mt_number_of_types = 0x000D, // number of memory types (mtDontTrack 148 mtTest = 0x0E00, // Test type for verifying NMT
149 mt_number_of_types = 0x000E, // number of memory types (mtDontTrack
152 // is not included as validate type) 150 // is not included as validate type)
153 mtDontTrack = 0x0E00, // memory we do not or cannot track 151 mtDontTrack = 0x0F00, // memory we do not or cannot track
154 mt_masks = 0x7F00, 152 mt_masks = 0x7F00,
155 153
156 // object type mask 154 // object type mask
157 otArena = 0x0010, // an arena object 155 otArena = 0x0010, // an arena object
158 otNMTRecorder = 0x0020, // memory recorder object 156 otNMTRecorder = 0x0020, // memory recorder object