comparison src/share/vm/services/classLoadingService.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents e6195383bcaf
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
34 #include "utilities/macros.hpp" 34 #include "utilities/macros.hpp"
35 35
36 #ifdef DTRACE_ENABLED 36 #ifdef DTRACE_ENABLED
37 37
38 // Only bother with this argument setup if dtrace is available 38 // Only bother with this argument setup if dtrace is available
39
40 #ifndef USDT2
41
42 HS_DTRACE_PROBE_DECL4(hotspot, class__loaded, char*, int, oop, bool);
43 HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool);
44
45 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \
46 { \
47 char* data = NULL; \
48 int len = 0; \
49 Symbol* name = (clss)->name(); \
50 if (name != NULL) { \
51 data = (char*)name->bytes(); \
52 len = name->utf8_length(); \
53 } \
54 HS_DTRACE_PROBE4(hotspot, class__##type, \
55 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \
56 }
57
58 #else /* USDT2 */
39 59
40 #define HOTSPOT_CLASS_unloaded HOTSPOT_CLASS_UNLOADED 60 #define HOTSPOT_CLASS_unloaded HOTSPOT_CLASS_UNLOADED
41 #define HOTSPOT_CLASS_loaded HOTSPOT_CLASS_LOADED 61 #define HOTSPOT_CLASS_loaded HOTSPOT_CLASS_LOADED
42 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \ 62 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \
43 { \ 63 { \
50 } \ 70 } \
51 HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \ 71 HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
52 data, len, (clss)->class_loader(), (shared)); \ 72 data, len, (clss)->class_loader(), (shared)); \
53 } 73 }
54 74
75 #endif /* USDT2 */
55 #else // ndef DTRACE_ENABLED 76 #else // ndef DTRACE_ENABLED
56 77
57 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) 78 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared)
58 79
59 #endif 80 #endif