1.1 --- a/src/share/vm/runtime/synchronizer.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/synchronizer.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -77,11 +77,11 @@
1.11 // Only bother with this argument setup if dtrace is available
1.12 // TODO-FIXME: probes should not fire when caller is _blocked. assert() accordingly.
1.13
1.14 -#define DTRACE_MONITOR_PROBE_COMMON(klassOop, thread) \
1.15 +#define DTRACE_MONITOR_PROBE_COMMON(obj, thread) \
1.16 char* bytes = NULL; \
1.17 int len = 0; \
1.18 jlong jtid = SharedRuntime::get_java_tid(thread); \
1.19 - Symbol* klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \
1.20 + Symbol* klassname = ((oop)(obj))->klass()->name(); \
1.21 if (klassname != NULL) { \
1.22 bytes = (char*)klassname->bytes(); \
1.23 len = klassname->utf8_length(); \
1.24 @@ -93,19 +93,19 @@
1.25 HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited,
1.26 jlong, uintptr_t, char*, int);
1.27
1.28 -#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
1.29 +#define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis) \
1.30 { \
1.31 if (DTraceMonitorProbes) { \
1.32 - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
1.33 + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \
1.34 HS_DTRACE_PROBE5(hotspot, monitor__wait, jtid, \
1.35 (monitor), bytes, len, (millis)); \
1.36 } \
1.37 }
1.38
1.39 -#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \
1.40 +#define DTRACE_MONITOR_PROBE(probe, monitor, obj, thread) \
1.41 { \
1.42 if (DTraceMonitorProbes) { \
1.43 - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
1.44 + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \
1.45 HS_DTRACE_PROBE4(hotspot, monitor__##probe, jtid, \
1.46 (uintptr_t)(monitor), bytes, len); \
1.47 } \
1.48 @@ -113,10 +113,10 @@
1.49
1.50 #else /* USDT2 */
1.51
1.52 -#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \
1.53 +#define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis) \
1.54 { \
1.55 if (DTraceMonitorProbes) { \
1.56 - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
1.57 + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \
1.58 HOTSPOT_MONITOR_WAIT(jtid, \
1.59 (uintptr_t)(monitor), bytes, len, (millis)); \
1.60 } \
1.61 @@ -124,10 +124,10 @@
1.62
1.63 #define HOTSPOT_MONITOR_PROBE_waited HOTSPOT_MONITOR_PROBE_WAITED
1.64
1.65 -#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \
1.66 +#define DTRACE_MONITOR_PROBE(probe, monitor, obj, thread) \
1.67 { \
1.68 if (DTraceMonitorProbes) { \
1.69 - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \
1.70 + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \
1.71 HOTSPOT_MONITOR_PROBE_##probe(jtid, /* probe = waited */ \
1.72 (uintptr_t)(monitor), bytes, len); \
1.73 } \
1.74 @@ -136,8 +136,8 @@
1.75 #endif /* USDT2 */
1.76 #else // ndef DTRACE_ENABLED
1.77
1.78 -#define DTRACE_MONITOR_WAIT_PROBE(klassOop, thread, millis, mon) {;}
1.79 -#define DTRACE_MONITOR_PROBE(probe, klassOop, thread, mon) {;}
1.80 +#define DTRACE_MONITOR_WAIT_PROBE(obj, thread, millis, mon) {;}
1.81 +#define DTRACE_MONITOR_PROBE(probe, obj, thread, mon) {;}
1.82
1.83 #endif // ndef DTRACE_ENABLED
1.84
