| 1 |
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/dtrace.make openjdk/hotspot/make/linux/makefiles/dtrace.make |
| 2 |
--- openjdk.orig/hotspot/make/linux/makefiles/dtrace.make 2012-02-22 14:54:31.000000000 +0000 |
| 3 |
+++ openjdk/hotspot/make/linux/makefiles/dtrace.make 2012-03-18 18:54:13.482968139 +0000 |
| 4 |
@@ -25,3 +25,7 @@ |
| 5 |
# Linux does not build jvm_db |
| 6 |
LIBJVM_DB = |
| 7 |
|
| 8 |
+# But it does have a Systemtap dtrace compatible sys/sdt.h |
| 9 |
+CFLAGS += -DDTRACE_ENABLED |
| 10 |
+ |
| 11 |
+# It doesn't support HAVE_DTRACE_H though. |
| 12 |
diff -Nru openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp |
| 13 |
--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp 2012-02-22 14:54:31.000000000 +0000 |
| 14 |
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp 2012-03-18 18:54:13.502968466 +0000 |
| 15 |
@@ -2818,10 +2818,7 @@ |
| 16 |
JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \ |
| 17 |
JNIWrapper("Set" XSTR(Result) "Field"); \ |
| 18 |
\ |
| 19 |
- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, Set##Result##Field__entry, \ |
| 20 |
- ( JNIEnv*, jobject, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ |
| 21 |
- HS_DTRACE_PROBE_N(hotspot_jni, Set##Result##Field__entry, \ |
| 22 |
- ( env, obj, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ |
| 23 |
+ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID, value),DTRACE_PROBE3(hotspot_jni, Set##Result##Field__entry, env, obj, fieldID)); \ |
| 24 |
\ |
| 25 |
oop o = JNIHandles::resolve_non_null(obj); \ |
| 26 |
klassOop k = o->klass(); \ |
| 27 |
@@ -3128,10 +3125,7 @@ |
| 28 |
\ |
| 29 |
JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID fieldID, Argument value)) \ |
| 30 |
JNIWrapper("SetStatic" XSTR(Result) "Field"); \ |
| 31 |
- HS_DTRACE_PROBE_CDECL_N(hotspot_jni, SetStatic##Result##Field__entry,\ |
| 32 |
- ( JNIEnv*, jclass, jfieldID FP_SELECT_##Result(COMMA Argument,/*empty*/) ) ); \ |
| 33 |
- HS_DTRACE_PROBE_N(hotspot_jni, SetStatic##Result##Field__entry, \ |
| 34 |
- ( env, clazz, fieldID FP_SELECT_##Result(COMMA value,/*empty*/) ) ); \ |
| 35 |
+ FP_SELECT_##Result(DTRACE_PROBE4(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID, value),DTRACE_PROBE3(hotspot_jni, SetStatic##Result##Field__entry, env, clazz, fieldID)); \ |
| 36 |
\ |
| 37 |
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ |
| 38 |
assert(id->is_static_field_id(), "invalid static field id"); \ |
| 39 |
--- openjdk.orig/hotspot/src/share/vm/utilities/dtrace.hpp 2012-02-22 15:54:31.000000000 +0100 |
| 40 |
+++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp 2012-03-27 13:12:15.857491730 +0200 |
| 41 |
@@ -1,5 +1,6 @@ |
| 42 |
/* |
| 43 |
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
| 44 |
+ * Copyright (c) 2009, 2012 Red Hat, Inc. |
| 45 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 46 |
* |
| 47 |
* This code is free software; you can redistribute it and/or modify it |
| 48 |
@@ -32,12 +33,15 @@ |
| 49 |
#define DTRACE_ONLY(x) x |
| 50 |
#define NOT_DTRACE(x) |
| 51 |
|
| 52 |
+#if defined(SOLARIS) |
| 53 |
// Work around dtrace tail call bug 6672627 until it is fixed in solaris 10. |
| 54 |
#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \ |
| 55 |
do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0) |
| 56 |
|
| 57 |
-#if defined(SOLARIS) |
| 58 |
#define USDT1 1 |
| 59 |
+#elif defined(LINUX) |
| 60 |
+#define USDT1 1 |
| 61 |
+#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() |
| 62 |
#elif defined(__APPLE__) |
| 63 |
#define USDT2 1 |
| 64 |
#include <sys/types.h> |
| 65 |
@@ -63,6 +67,11 @@ |
| 66 |
#define DTRACE_PROBE3(a,b,c,d,e) {;} |
| 67 |
#define DTRACE_PROBE4(a,b,c,d,e,f) {;} |
| 68 |
#define DTRACE_PROBE5(a,b,c,d,e,f,g) {;} |
| 69 |
+#define DTRACE_PROBE6(a,b,c,d,e,f,g,h) {;} |
| 70 |
+#define DTRACE_PROBE7(a,b,c,d,e,f,g,h,i) {;} |
| 71 |
+#define DTRACE_PROBE8(a,b,c,d,e,f,g,h,i,j) {;} |
| 72 |
+#define DTRACE_PROBE9(a,b,c,d,e,f,g,h,i,j,k) {;} |
| 73 |
+#define DTRACE_PROBE10(a,b,c,d,e,f,g,h,i,j,k,l) {;} |
| 74 |
|
| 75 |
#else /* USDT2 */ |
| 76 |
|
| 77 |
@@ -76,10 +85,19 @@ |
| 78 |
#define HS_DTRACE_PROBE_FN(provider,name)\ |
| 79 |
__dtrace_##provider##___##name |
| 80 |
|
| 81 |
+#ifdef SOLARIS |
| 82 |
+// Solaris dtrace needs actual extern function decls. |
| 83 |
#define HS_DTRACE_PROBE_DECL_N(provider,name,args) \ |
| 84 |
DTRACE_ONLY(extern "C" void HS_DTRACE_PROBE_FN(provider,name) args) |
| 85 |
#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) \ |
| 86 |
DTRACE_ONLY(extern void HS_DTRACE_PROBE_FN(provider,name) args) |
| 87 |
+#elif defined(LINUX) |
| 88 |
+// Systemtap dtrace compatible probes on GNU/Linux don't. |
| 89 |
+#define HS_DTRACE_PROBE_DECL_N(provider,name,args) |
| 90 |
+#define HS_DTRACE_PROBE_CDECL_N(provider,name,args) |
| 91 |
+#else |
| 92 |
+#error "USDT1 enabled for unknown os" |
| 93 |
+#endif |
| 94 |
|
| 95 |
/* Dtrace probe declarations */ |
| 96 |
#define HS_DTRACE_PROBE_DECL(provider,name) \ |
| 97 |
@@ -118,6 +136,8 @@ |
| 98 |
uintptr_t,uintptr_t,uintptr_t)) |
| 99 |
|
| 100 |
/* Dtrace probe definitions */ |
| 101 |
+#if defined(SOLARIS) |
| 102 |
+// Solaris dtrace uses actual function calls. |
| 103 |
#define HS_DTRACE_PROBE_N(provider,name, args) \ |
| 104 |
DTRACE_ONLY(HS_DTRACE_PROBE_FN(provider,name) args) |
| 105 |
|
| 106 |
@@ -153,6 +173,34 @@ |
| 107 |
HS_DTRACE_PROBE_N(provider,name,((uintptr_t)a0,(uintptr_t)a1,(uintptr_t)a2,\ |
| 108 |
(uintptr_t)a3,(uintptr_t)a4,(uintptr_t)a5,(uintptr_t)a6,(uintptr_t)a7,\ |
| 109 |
(uintptr_t)a8,(uintptr_t)a9)) |
| 110 |
+#elif defined(LINUX) |
| 111 |
+// Systemtap dtrace compatible probes on GNU/Linux use direct macros. |
| 112 |
+#define HS_DTRACE_PROBE(provider,name) HS_DTRACE_PROBE0(provider,name) |
| 113 |
+#define HS_DTRACE_PROBE0(provider,name)\ |
| 114 |
+ DTRACE_PROBE(provider,name) |
| 115 |
+#define HS_DTRACE_PROBE1(provider,name,a0)\ |
| 116 |
+ DTRACE_PROBE1(provider,name,a0) |
| 117 |
+#define HS_DTRACE_PROBE2(provider,name,a0,a1)\ |
| 118 |
+ DTRACE_PROBE2(provider,name,a0,a1) |
| 119 |
+#define HS_DTRACE_PROBE3(provider,name,a0,a1,a2)\ |
| 120 |
+ DTRACE_PROBE3(provider,name,a0,a1,a2) |
| 121 |
+#define HS_DTRACE_PROBE4(provider,name,a0,a1,a2,a3)\ |
| 122 |
+ DTRACE_PROBE4(provider,name,a0,a1,a2,a3) |
| 123 |
+#define HS_DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4)\ |
| 124 |
+ DTRACE_PROBE5(provider,name,a0,a1,a2,a3,a4) |
| 125 |
+#define HS_DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5)\ |
| 126 |
+ DTRACE_PROBE6(provider,name,a0,a1,a2,a3,a4,a5) |
| 127 |
+#define HS_DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6)\ |
| 128 |
+ DTRACE_PROBE7(provider,name,a0,a1,a2,a3,a4,a5,a6) |
| 129 |
+#define HS_DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7)\ |
| 130 |
+ DTRACE_PROBE8(provider,name,a0,a1,a2,a3,a4,a5,a6,a7) |
| 131 |
+#define HS_DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ |
| 132 |
+ DTRACE_PROBE9(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) |
| 133 |
+#define HS_DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8)\ |
| 134 |
+ DTRACE_PROBE10(provider,name,a0,a1,a2,a3,a4,a5,a6,a7,a8) |
| 135 |
+#else |
| 136 |
+#error "USDT1 enabled for unknown os" |
| 137 |
+#endif |
| 138 |
|
| 139 |
#endif /* !USDT2 */ |
| 140 |
|
Parent Directory
| 
Revision Log