Mercurial > hg > graal-jvmci-8

comparison src/share/vm/oops/instanceKlass.cpp @ 22967:4390345de45c hs25.60-b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 17 Apr 2015 01:33:13 -0700
parents d8f133adf05d 6f31df24cec0
children 3c8b53552a43
comparison
equal deleted inserted replaced
22958:fc3cd1db10e2 22967:4390345de45c
108 if (name != NULL) { \ 108 if (name != NULL) { \
109 data = (char*)name->bytes(); \ 109 data = (char*)name->bytes(); \
110 len = name->utf8_length(); \ 110 len = name->utf8_length(); \
111 } \ 111 } \
112 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ 112 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \
113 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \ 113 data, len, (void *)(clss)->class_loader(), thread_type); \
114 } 114 }
115 115
116 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ 116 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
117 { \ 117 { \
118 char* data = NULL; \ 118 char* data = NULL; \
121 if (name != NULL) { \ 121 if (name != NULL) { \
122 data = (char*)name->bytes(); \ 122 data = (char*)name->bytes(); \
123 len = name->utf8_length(); \ 123 len = name->utf8_length(); \
124 } \ 124 } \
125 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ 125 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \
126 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \ 126 data, len, (void *)(clss)->class_loader(), thread_type, wait); \
127 } 127 }
128 #else /* USDT2 */ 128 #else /* USDT2 */
129 129
130 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED 130 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED
131 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE 131 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE