current/SOURCES/bz1204159_java8.patch

diff -r 6e357a1fc157 tapset/hotspot.stp.in
--- tapset/hotspot-1.8.0.stp.in Tue Apr 26 18:36:01 2016 +0100
+++ tapset/hotspot-1.8.0.stp.in Wed Jul 13 14:06:31 2016 -0400
@@ -141,7 +141,8 @@
    Triggers at the end of the virtual machine initialization.
    Has no arguments.
  */
-probe hotspot.vm_init_end =
+probe hotspot_vm_init_end = hotspot.vm_init_end8 {}
+probe hotspot.vm_init_end8 =
   process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__end"),
   process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__end")
 {
diff -r 6e357a1fc157 tapset/jstack.stp.in
--- tapset/jstack-1.8.0.stp.in  Tue Apr 26 18:36:01 2016 +0100
+++ tapset/jstack-1.8.0.stp.in  Wed Jul 13 14:06:31 2016 -0400
@@ -45,22 +45,28 @@
  semantic error: failed to retrieve location attribute for local
 */
 
-global CodeCache_heap;
+/* Resolve multiple installed java versions conflict. */
+@define _private %( %( systemtap_v >= "3.0" %? private %) %)
+@define _check_match %(
+  %( systemtap_v >= "3.0" %? if (pp() !~ "@prefix@") next %)
+%)
 
-global sp_register;
-global fp_register;
-global pc_register;
-global ptr_size;
-global ptr_mask;
+@_private global CodeCache_heap;
 
-global constantPool_size;
-global HeapBlock_Header_size;
+@_private global sp_register;
+@_private global fp_register;
+@_private global pc_register;
+@_private global ptr_size;
+@_private global ptr_mask;
 
-global vm_inited;
+@_private global constantPool_size;
+@_private global HeapBlock_Header_size;
+
+@_private global vm_inited;
 
 /* We need to collect some global symbol addresses that cannot be resolved
    in a bare function and vm_init_end seems a good place to use. */
-probe hotspot.vm_init_end
+probe hotspot.vm_init_end8
 {
   /**
    * The CodeCache class contains the static CodeHeap _heap that
@@ -116,6 +122,8 @@
 
 function jstack:string()
 {
+  @_check_match
+
   // java backtraces can be a lot bigger, but we risk going over MAXACTION.
   // 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
   max_depth = 32;
@@ -125,6 +133,8 @@
 
 function jstack_n:string(max_depth:long)
 {
+  @_check_match
+
   // Whether to log the method signatures.
   log_sig = 0;
 
@@ -139,6 +149,8 @@
 
 function print_jstack()
 {
+  @_check_match
+
   // java backtraces can be a lot bigger, but we risk going over MAXACTION.
   // 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
   max_depth = 32;
@@ -148,6 +160,8 @@
 
 function print_jstack_n:string(max_depth:long)
 {
+  @_check_match
+
   // Whether to log the method signatures.
   log_sig = 0;
 
@@ -162,6 +176,8 @@
 
 function jstack_full:string()
 {
+  @_check_match
+
   // java backtraces can be a lot bigger, but we risk going over MAXACTION.
   // 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
   max_depth = 32;
@@ -171,6 +187,8 @@
 
 function jstack_full_n:string(max_depth:long)
 {
+  @_check_match
+
   // Whether to log the method signatures.
   log_sig = 1;
 
@@ -185,6 +203,8 @@
 
 function print_jstack_full()
 {
+  @_check_match
+
   // java backtraces can be a lot bigger, but we risk going over MAXACTION.
   // 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
   max_depth = 32;
@@ -194,6 +214,8 @@
 
 function print_jstack_full_n:string(max_depth:long)
 {
+  @_check_match
+
   // Whether to log the method signatures.
   log_sig = 1;
 
@@ -209,6 +231,8 @@
 function jstack_call:string(max_depth:long, log_sig:long, log_native:long,
                             print_frames:long)
 {
+  @_check_match
+
   if (! vm_inited[pid()])
     {
       frame = "<vm-not-inited>";
1	diff -r 6e357a1fc157 tapset/hotspot.stp.in
2	--- tapset/hotspot-1.8.0.stp.in Tue Apr 26 18:36:01 2016 +0100
3	+++ tapset/hotspot-1.8.0.stp.in Wed Jul 13 14:06:31 2016 -0400
4	@@ -141,7 +141,8 @@
5	Triggers at the end of the virtual machine initialization.
6	Has no arguments.
7	*/
8	-probe hotspot.vm_init_end =
9	+probe hotspot_vm_init_end = hotspot.vm_init_end8 {}
10	+probe hotspot.vm_init_end8 =
11	process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__end"),
12	process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__end")
13	{
14	diff -r 6e357a1fc157 tapset/jstack.stp.in
15	--- tapset/jstack-1.8.0.stp.in Tue Apr 26 18:36:01 2016 +0100
16	+++ tapset/jstack-1.8.0.stp.in Wed Jul 13 14:06:31 2016 -0400
17	@@ -45,22 +45,28 @@
18	semantic error: failed to retrieve location attribute for local
19	*/
20
21	-global CodeCache_heap;
22	+/* Resolve multiple installed java versions conflict. */
23	+@define _private %( %( systemtap_v >= "3.0" %? private %) %)
24	+@define _check_match %(
25	+ %( systemtap_v >= "3.0" %? if (pp() !~ "@prefix@") next %)
26	+%)
27
28	-global sp_register;
29	-global fp_register;
30	-global pc_register;
31	-global ptr_size;
32	-global ptr_mask;
33	+@_private global CodeCache_heap;
34
35	-global constantPool_size;
36	-global HeapBlock_Header_size;
37	+@_private global sp_register;
38	+@_private global fp_register;
39	+@_private global pc_register;
40	+@_private global ptr_size;
41	+@_private global ptr_mask;
42
43	-global vm_inited;
44	+@_private global constantPool_size;
45	+@_private global HeapBlock_Header_size;
46	+
47	+@_private global vm_inited;
48
49	/* We need to collect some global symbol addresses that cannot be resolved
50	in a bare function and vm_init_end seems a good place to use. */
51	-probe hotspot.vm_init_end
52	+probe hotspot.vm_init_end8
53	{
54	/**
55	* The CodeCache class contains the static CodeHeap _heap that
56	@@ -116,6 +122,8 @@
57
58	function jstack:string()
59	{
60	+ @_check_match
61	+
62	// java backtraces can be a lot bigger, but we risk going over MAXACTION.
63	// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
64	max_depth = 32;
65	@@ -125,6 +133,8 @@
66
67	function jstack_n:string(max_depth:long)
68	{
69	+ @_check_match
70	+
71	// Whether to log the method signatures.
72	log_sig = 0;
73
74	@@ -139,6 +149,8 @@
75
76	function print_jstack()
77	{
78	+ @_check_match
79	+
80	// java backtraces can be a lot bigger, but we risk going over MAXACTION.
81	// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
82	max_depth = 32;
83	@@ -148,6 +160,8 @@
84
85	function print_jstack_n:string(max_depth:long)
86	{
87	+ @_check_match
88	+
89	// Whether to log the method signatures.
90	log_sig = 0;
91
92	@@ -162,6 +176,8 @@
93
94	function jstack_full:string()
95	{
96	+ @_check_match
97	+
98	// java backtraces can be a lot bigger, but we risk going over MAXACTION.
99	// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
100	max_depth = 32;
101	@@ -171,6 +187,8 @@
102
103	function jstack_full_n:string(max_depth:long)
104	{
105	+ @_check_match
106	+
107	// Whether to log the method signatures.
108	log_sig = 1;
109
110	@@ -185,6 +203,8 @@
111
112	function print_jstack_full()
113	{
114	+ @_check_match
115	+
116	// java backtraces can be a lot bigger, but we risk going over MAXACTION.
117	// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
118	max_depth = 32;
119	@@ -194,6 +214,8 @@
120
121	function print_jstack_full_n:string(max_depth:long)
122	{
123	+ @_check_match
124	+
125	// Whether to log the method signatures.
126	log_sig = 1;
127
128	@@ -209,6 +231,8 @@
129	function jstack_call:string(max_depth:long, log_sig:long, log_native:long,
130	print_frames:long)
131	{
132	+ @_check_match
133	+
134	if (! vm_inited[pid()])
135	{
136	frame = "<vm-not-inited>";