Mercurial > hg > graal-compiler

comparison src/share/vm/services/classLoadingService.cpp @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents 1d1603768966
children da91efe96a93
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
33 #include "utilities/dtrace.hpp" 33 #include "utilities/dtrace.hpp"
34 34
35 #ifdef DTRACE_ENABLED 35 #ifdef DTRACE_ENABLED
36 36
37 // Only bother with this argument setup if dtrace is available 37 // Only bother with this argument setup if dtrace is available
38
39 #ifndef USDT2
38 40
39 HS_DTRACE_PROBE_DECL4(hotspot, class__loaded, char*, int, oop, bool); 41 HS_DTRACE_PROBE_DECL4(hotspot, class__loaded, char*, int, oop, bool);
40 HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool); 42 HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool);
41 43
42 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \ 44 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \
50 } \ 52 } \
51 HS_DTRACE_PROBE4(hotspot, class__##type, \ 53 HS_DTRACE_PROBE4(hotspot, class__##type, \
52 data, len, (clss)->class_loader(), (shared)); \ 54 data, len, (clss)->class_loader(), (shared)); \
53 } 55 }
54 56
57 #else /* USDT2 */
58
59 #define HOTSPOT_CLASS_unloaded HOTSPOT_CLASS_UNLOADED
60 #define HOTSPOT_CLASS_loaded HOTSPOT_CLASS_LOADED
61 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) \
62 { \
63 char* data = NULL; \
64 int len = 0; \
65 Symbol* name = (clss)->name(); \
66 if (name != NULL) { \
67 data = (char*)name->bytes(); \
68 len = name->utf8_length(); \
69 } \
70 HOTSPOT_CLASS_##type( /* type = unloaded, loaded */ \
71 data, len, (clss)->class_loader(), (shared)); \
72 }
73
74 #endif /* USDT2 */
55 #else // ndef DTRACE_ENABLED 75 #else // ndef DTRACE_ENABLED
56 76
57 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared) 77 #define DTRACE_CLASSLOAD_PROBE(type, clss, shared)
58 78
59 #endif 79 #endif