Mercurial > hg > truffle
comparison src/share/vm/utilities/dtrace.hpp @ 14319:a00b8f42c4c4
8032462: Change the linux SDT implementation to use USDT2 instead of USDT1
Reviewed-by: coleenp, sspitsyn, kamg
author | sla |
---|---|
date | Mon, 03 Feb 2014 13:41:26 +0100 |
parents | a3ba776d6ab6 |
children | e6195383bcaf |
comparison
equal
deleted
inserted
replaced
14318:1020b892787b | 14319:a00b8f42c4c4 |
---|---|
36 #if defined(SOLARIS) | 36 #if defined(SOLARIS) |
37 // Work around dtrace tail call bug 6672627 until it is fixed in solaris 10. | 37 // Work around dtrace tail call bug 6672627 until it is fixed in solaris 10. |
38 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \ | 38 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() \ |
39 do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0) | 39 do { volatile size_t dtrace_workaround_tail_call_bug = 1; } while (0) |
40 | 40 |
41 #elif defined(LINUX) | |
42 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() | |
43 #elif defined(__APPLE__) | |
44 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() | |
45 #include <sys/types.h> | |
46 #else | |
47 #error "dtrace enabled for unknown os" | |
48 #endif /* defined(SOLARIS) */ | |
49 | |
41 #define USDT2 1 | 50 #define USDT2 1 |
42 #include "dtracefiles/hotspot.h" | 51 #include "dtracefiles/hotspot.h" |
43 #include "dtracefiles/hotspot_jni.h" | 52 #include "dtracefiles/hotspot_jni.h" |
44 #include "dtracefiles/hs_private.h" | 53 #include "dtracefiles/hs_private.h" |
45 #elif defined(LINUX) | |
46 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() | |
47 #define USDT1 1 | |
48 #elif defined(__APPLE__) | |
49 #define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG() | |
50 #define USDT2 1 | |
51 #include <sys/types.h> | |
52 #include "dtracefiles/hotspot.h" | |
53 #include "dtracefiles/hotspot_jni.h" | |
54 #include "dtracefiles/hs_private.h" | |
55 #else | |
56 #error "dtrace enabled for unknown os" | |
57 #endif /* defined(SOLARIS) */ | |
58 | 54 |
59 #else /* defined(DTRACE_ENABLED) */ | 55 #else /* defined(DTRACE_ENABLED) */ |
60 | 56 |
61 #define DTRACE_ONLY(x) | 57 #define DTRACE_ONLY(x) |
62 #define NOT_DTRACE(x) x | 58 #define NOT_DTRACE(x) x |