comparison src/share/vm/prims/jvmtiExport.cpp @ 8003:3c9bc17b9403

Merge
author bpittore
date Thu, 07 Feb 2013 16:05:48 -0500
parents 8b46b0196eb0 db9981fd3124
children 0b7f78069732
comparison
equal deleted inserted replaced
7989:454d7cc622ab 8003:3c9bc17b9403
48 #include "runtime/objectMonitor.inline.hpp" 48 #include "runtime/objectMonitor.inline.hpp"
49 #include "runtime/thread.hpp" 49 #include "runtime/thread.hpp"
50 #include "runtime/vframe.hpp" 50 #include "runtime/vframe.hpp"
51 #include "services/attachListener.hpp" 51 #include "services/attachListener.hpp"
52 #include "services/serviceUtil.hpp" 52 #include "services/serviceUtil.hpp"
53 #ifndef SERIALGC 53 #include "utilities/macros.hpp"
54 #if INCLUDE_ALL_GCS
54 #include "gc_implementation/parallelScavenge/psMarkSweep.hpp" 55 #include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
55 #endif 56 #endif // INCLUDE_ALL_GCS
56 57
57 #ifdef JVMTI_TRACE 58 #ifdef JVMTI_TRACE
58 #define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; } 59 #define EVT_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_SENT) != 0) { SafeResourceMark rm; tty->print_cr out; }
59 #define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm; tty->print_cr out; } 60 #define EVT_TRIG_TRACE(evt,out) if ((JvmtiTrace::event_trace_flags(evt) & JvmtiTrace::SHOW_EVENT_TRIGGER) != 0) { SafeResourceMark rm; tty->print_cr out; }
60 #else 61 #else