comparison src/share/vm/services/runtimeService.cpp @ 8002:8391fdd36e1f

Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children 07a4efc5ed14
comparison
equal deleted inserted replaced
7946:6fbe8a57549d 8002:8391fdd36e1f
27 #include "services/attachListener.hpp" 27 #include "services/attachListener.hpp"
28 #include "services/management.hpp" 28 #include "services/management.hpp"
29 #include "services/runtimeService.hpp" 29 #include "services/runtimeService.hpp"
30 #include "utilities/dtrace.hpp" 30 #include "utilities/dtrace.hpp"
31 #include "utilities/exceptions.hpp" 31 #include "utilities/exceptions.hpp"
32 #include "utilities/macros.hpp"
32 33
33 #ifndef USDT2 34 #ifndef USDT2
34 HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin); 35 HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin);
35 HS_DTRACE_PROBE_DECL(hs_private, safepoint__end); 36 HS_DTRACE_PROBE_DECL(hs_private, safepoint__end);
36 #endif /* !USDT2 */ 37 #endif /* !USDT2 */