Mercurial > hg > truffle

comparison src/share/vm/memory/allocation.hpp @ 9159:43223d3f5dcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx/hotspot-comp
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 16 Apr 2013 17:39:46 +0200
parents 89e4d67fdd2a f36e073d56a4
children 836a62f43af9
comparison
equal deleted inserted replaced
9158:9d74a0d7b231 9159:43223d3f5dcd
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
176 const bool NMT_track_callsite = false; 176 const bool NMT_track_callsite = false;
177 177
178 #endif // INCLUDE_NMT 178 #endif // INCLUDE_NMT
179 179
180 // debug build does not inline 180 // debug build does not inline
181 #if defined(_DEBUG_) 181 #if defined(_NMT_NOINLINE_)
182 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0) 182 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)
183 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0) 183 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0)
184 #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0) 184 #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)
185 #else 185 #else
186 #define CURRENT_PC (NMT_track_callsite? os::get_caller_pc(0) : 0) 186 #define CURRENT_PC (NMT_track_callsite? os::get_caller_pc(0) : 0)