comparison src/share/vm/memory/allocation.hpp @ 10132:5b6512efcdc4

Merge
author dcubed
date Fri, 19 Apr 2013 16:51:27 -0700
parents 6f817ce50129 f36e073d56a4
children cc12becb22e7
comparison
equal deleted inserted replaced
10130:6f817ce50129 10132:5b6512efcdc4
188 const bool NMT_track_callsite = false; 188 const bool NMT_track_callsite = false;
189 189
190 #endif // INCLUDE_NMT 190 #endif // INCLUDE_NMT
191 191
192 // debug build does not inline 192 // debug build does not inline
193 #if defined(_DEBUG_) 193 #if defined(_NMT_NOINLINE_)
194 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0) 194 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)
195 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0) 195 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
196 #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0) 196 #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)
197 #else 197 #else
198 #define CURRENT_PC (NMT_track_callsite? os::get_caller_pc(0) : 0) 198 #define CURRENT_PC (NMT_track_callsite? os::get_caller_pc(0) : 0)