Mercurial > hg > openjdk > icedtea > jdk7 > hotspot
changeset 3288:34e2e90e7182
7130476: Remove use of #ifdef TRACE_DEFINE_KLASS_TRACE_ID from klass.hpp
Reviewed-by: kamg, phh, dsamersoff
Contributed-by: Rickard Backman <rickard.backman@oracle.com>
| author | rbackman |
|---|---|
| date | Tue, 24 Jan 2012 14:48:22 +0100 |
| parents | de268c8a8075 |
| children | 26a08cbbf042 f457154eee8b |
| files | src/share/vm/oops/klass.cpp src/share/vm/oops/klass.hpp src/share/vm/trace/traceMacros.hpp |
| diffstat | 3 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/klass.cpp Thu Jan 26 20:06:06 2012 -0500 +++ b/src/share/vm/oops/klass.cpp Tue Jan 24 14:48:22 2012 +0100 @@ -158,9 +158,7 @@ kl->set_next_sibling(NULL); kl->set_alloc_count(0); kl->set_alloc_size(0); -#ifdef TRACE_SET_KLASS_TRACE_ID TRACE_SET_KLASS_TRACE_ID(kl, 0); -#endif kl->set_prototype_header(markOopDesc::prototype()); kl->set_biased_lock_revocation_count(0);
--- a/src/share/vm/oops/klass.hpp Thu Jan 26 20:06:06 2012 -0500 +++ b/src/share/vm/oops/klass.hpp Tue Jan 24 14:48:22 2012 +0100 @@ -265,9 +265,7 @@ markOop _prototype_header; // Used when biased locking is both enabled and disabled for this type jint _biased_lock_revocation_count; -#ifdef TRACE_DEFINE_KLASS_TRACE_ID TRACE_DEFINE_KLASS_TRACE_ID; -#endif public: // returns the enclosing klassOop @@ -688,9 +686,7 @@ jlong last_biased_lock_bulk_revocation_time() { return _last_biased_lock_bulk_revocation_time; } void set_last_biased_lock_bulk_revocation_time(jlong cur_time) { _last_biased_lock_bulk_revocation_time = cur_time; } -#ifdef TRACE_DEFINE_KLASS_METHODS TRACE_DEFINE_KLASS_METHODS; -#endif // garbage collection support virtual void follow_weak_klass_links(
--- a/src/share/vm/trace/traceMacros.hpp Thu Jan 26 20:06:06 2012 -0500 +++ b/src/share/vm/trace/traceMacros.hpp Tue Jan 24 14:48:22 2012 +0100 @@ -40,4 +40,8 @@ #define TRACE_START() true #define TRACE_INITIALIZE() 0 +#define TRACE_SET_KLASS_TRACE_ID(x1, x2) do { } while (0) +#define TRACE_DEFINE_KLASS_METHODS typedef int ___IGNORED_hs_trace_type1 +#define TRACE_DEFINE_KLASS_TRACE_ID typedef int ___IGNORED_hs_trace_type2 + #endif