Mercurial > hg > graal-compiler
comparison src/share/vm/compiler/compileBroker.cpp @ 4006:436b4a3231bf
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 | f918d6096e23 |
children | d8cb48376797 |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
56 | 56 |
57 #ifdef DTRACE_ENABLED | 57 #ifdef DTRACE_ENABLED |
58 | 58 |
59 // Only bother with this argument setup if dtrace is available | 59 // Only bother with this argument setup if dtrace is available |
60 | 60 |
61 #ifndef USDT2 | |
61 HS_DTRACE_PROBE_DECL8(hotspot, method__compile__begin, | 62 HS_DTRACE_PROBE_DECL8(hotspot, method__compile__begin, |
62 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t); | 63 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t); |
63 HS_DTRACE_PROBE_DECL9(hotspot, method__compile__end, | 64 HS_DTRACE_PROBE_DECL9(hotspot, method__compile__end, |
64 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t, bool); | 65 char*, intptr_t, char*, intptr_t, char*, intptr_t, char*, intptr_t, bool); |
65 | 66 |
86 comp_name, strlen(comp_name), \ | 87 comp_name, strlen(comp_name), \ |
87 klass_name->bytes(), klass_name->utf8_length(), \ | 88 klass_name->bytes(), klass_name->utf8_length(), \ |
88 name->bytes(), name->utf8_length(), \ | 89 name->bytes(), name->utf8_length(), \ |
89 signature->bytes(), signature->utf8_length(), (success)); \ | 90 signature->bytes(), signature->utf8_length(), (success)); \ |
90 } | 91 } |
92 | |
93 #else /* USDT2 */ | |
94 | |
95 #define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method) \ | |
96 { \ | |
97 char* comp_name = (char*)(compiler)->name(); \ | |
98 Symbol* klass_name = (method)->klass_name(); \ | |
99 Symbol* name = (method)->name(); \ | |
100 Symbol* signature = (method)->signature(); \ | |
101 HOTSPOT_METHOD_COMPILE_BEGIN( \ | |
102 comp_name, strlen(comp_name), \ | |
103 (char *) klass_name->bytes(), klass_name->utf8_length(), \ | |
104 (char *) name->bytes(), name->utf8_length(), \ | |
105 (char *) signature->bytes(), signature->utf8_length()); \ | |
106 } | |
107 | |
108 #define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success) \ | |
109 { \ | |
110 char* comp_name = (char*)(compiler)->name(); \ | |
111 Symbol* klass_name = (method)->klass_name(); \ | |
112 Symbol* name = (method)->name(); \ | |
113 Symbol* signature = (method)->signature(); \ | |
114 HOTSPOT_METHOD_COMPILE_END( \ | |
115 comp_name, strlen(comp_name), \ | |
116 (char *) klass_name->bytes(), klass_name->utf8_length(), \ | |
117 (char *) name->bytes(), name->utf8_length(), \ | |
118 (char *) signature->bytes(), signature->utf8_length(), (success)); \ | |
119 } | |
120 #endif /* USDT2 */ | |
91 | 121 |
92 #else // ndef DTRACE_ENABLED | 122 #else // ndef DTRACE_ENABLED |
93 | 123 |
94 #define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method) | 124 #define DTRACE_METHOD_COMPILE_BEGIN_PROBE(compiler, method) |
95 #define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success) | 125 #define DTRACE_METHOD_COMPILE_END_PROBE(compiler, method, success) |