Mercurial > hg > graal-compiler
diff src/share/vm/runtime/synchronizer.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 04b9a2566eec da91efe96a93 |
children | 2cb439954abf |
line wrap: on
line diff
--- a/src/share/vm/runtime/synchronizer.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/runtime/synchronizer.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,11 +77,11 @@ // Only bother with this argument setup if dtrace is available // TODO-FIXME: probes should not fire when caller is _blocked. assert() accordingly. -#define DTRACE_MONITOR_PROBE_COMMON(klassOop, thread) \ +#define DTRACE_MONITOR_PROBE_COMMON(obj, thread) \ char* bytes = NULL; \ int len = 0; \ jlong jtid = SharedRuntime::get_java_tid(thread); \ - Symbol* klassname = ((oop)(klassOop))->klass()->klass_part()->name(); \ + Symbol* klassname = ((oop)(obj))->klass()->name(); \ if (klassname != NULL) { \ bytes = (char*)klassname->bytes(); \ len = klassname->utf8_length(); \ @@ -93,19 +93,19 @@ HS_DTRACE_PROBE_DECL4(hotspot, monitor__waited, jlong, uintptr_t, char*, int); -#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \ +#define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis) \ { \ if (DTraceMonitorProbes) { \ - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \ + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \ HS_DTRACE_PROBE5(hotspot, monitor__wait, jtid, \ (monitor), bytes, len, (millis)); \ } \ } -#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \ +#define DTRACE_MONITOR_PROBE(probe, monitor, obj, thread) \ { \ if (DTraceMonitorProbes) { \ - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \ + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \ HS_DTRACE_PROBE4(hotspot, monitor__##probe, jtid, \ (uintptr_t)(monitor), bytes, len); \ } \ @@ -113,10 +113,10 @@ #else /* USDT2 */ -#define DTRACE_MONITOR_WAIT_PROBE(monitor, klassOop, thread, millis) \ +#define DTRACE_MONITOR_WAIT_PROBE(monitor, obj, thread, millis) \ { \ if (DTraceMonitorProbes) { \ - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \ + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \ HOTSPOT_MONITOR_WAIT(jtid, \ (uintptr_t)(monitor), bytes, len, (millis)); \ } \ @@ -124,10 +124,10 @@ #define HOTSPOT_MONITOR_PROBE_waited HOTSPOT_MONITOR_PROBE_WAITED -#define DTRACE_MONITOR_PROBE(probe, monitor, klassOop, thread) \ +#define DTRACE_MONITOR_PROBE(probe, monitor, obj, thread) \ { \ if (DTraceMonitorProbes) { \ - DTRACE_MONITOR_PROBE_COMMON(klassOop, thread); \ + DTRACE_MONITOR_PROBE_COMMON(obj, thread); \ HOTSPOT_MONITOR_PROBE_##probe(jtid, /* probe = waited */ \ (uintptr_t)(monitor), bytes, len); \ } \ @@ -136,8 +136,8 @@ #endif /* USDT2 */ #else // ndef DTRACE_ENABLED -#define DTRACE_MONITOR_WAIT_PROBE(klassOop, thread, millis, mon) {;} -#define DTRACE_MONITOR_PROBE(probe, klassOop, thread, mon) {;} +#define DTRACE_MONITOR_WAIT_PROBE(obj, thread, millis, mon) {;} +#define DTRACE_MONITOR_PROBE(probe, obj, thread, mon) {;} #endif // ndef DTRACE_ENABLED