Mercurial > hg > truffle

comparison src/share/vm/memory/allocation.hpp @ 6854:fb19af007ffc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7189254: Change makefiles for more flexibility to override defaults Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles. Reviewed-by: dholmes, coleenp
author jprovino
date Wed, 10 Oct 2012 14:35:58 -0400
parents da91efe96a93
children 7b5885dadbdc
comparison
equal deleted inserted replaced
6830:81e878c53615 6854:fb19af007ffc
25 #ifndef SHARE_VM_MEMORY_ALLOCATION_HPP 25 #ifndef SHARE_VM_MEMORY_ALLOCATION_HPP
26 #define SHARE_VM_MEMORY_ALLOCATION_HPP 26 #define SHARE_VM_MEMORY_ALLOCATION_HPP
27 27
28 #include "runtime/globals.hpp" 28 #include "runtime/globals.hpp"
29 #include "utilities/globalDefinitions.hpp" 29 #include "utilities/globalDefinitions.hpp"
30 #include "utilities/macros.hpp"
30 #ifdef COMPILER1 31 #ifdef COMPILER1
31 #include "c1/c1_globals.hpp" 32 #include "c1/c1_globals.hpp"
32 #endif 33 #endif
33 #ifdef COMPILER2 34 #ifdef COMPILER2
34 #include "opto/c2_globals.hpp" 35 #include "opto/c2_globals.hpp"
155 #define IS_NMT_RECORDER(flags) ((flags & ot_masks) == otNMTRecorder) 156 #define IS_NMT_RECORDER(flags) ((flags & ot_masks) == otNMTRecorder)
156 #define NMT_CAN_TRACK(flags) (!IS_NMT_RECORDER(flags) && !(IS_MEMORY_TYPE(flags, mtDontTrack))) 157 #define NMT_CAN_TRACK(flags) (!IS_NMT_RECORDER(flags) && !(IS_MEMORY_TYPE(flags, mtDontTrack)))
157 158
158 typedef unsigned short MEMFLAGS; 159 typedef unsigned short MEMFLAGS;
159 160
161 #if INCLUDE_NMT
162
160 extern bool NMT_track_callsite; 163 extern bool NMT_track_callsite;
164
165 #else
166
167 const bool NMT_track_callsite = false;
168
169 #endif // INCLUDE_NMT
161 170
162 // debug build does not inline 171 // debug build does not inline
163 #if defined(_DEBUG_) 172 #if defined(_DEBUG_)
164 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0) 173 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)
165 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0) 174 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)