openjdk team mailing list archive

[Jakub Wilk <jwilk@xxxxxxxxxx>]

Package: openjdk-7-jre-headless
Version: 7u65-2.5.2-3
Severity: important
User: multiarch-devel@xxxxxxxxxxxxxxxxxxxxxxx
Usertags: multiarch

openjdk-7-jre-headless is marked as "Multi-Arch: same", but the 
following file is architecture-dependent:

/usr/share/systemtap/tapset/hotspot.stp

An example diff between i386 and amd64 is attached.

--
Jakub Wilk

diff -ur openjdk-7-jre-headless_7u65-2.5.2-3_i386/usr/share/systemtap/tapset/hotspot.stp openjdk-7-jre-headless_7u65-2.5.2-3_amd64/usr/share/systemtap/tapset/hotspot.stp
--- openjdk-7-jre-headless_7u65-2.5.2-3_i386/usr/share/systemtap/tapset/hotspot.stp	2014-09-09 21:03:21.000000000 +0200
+++ openjdk-7-jre-headless_7u65-2.5.2-3_amd64/usr/share/systemtap/tapset/hotspot.stp	2014-09-09 15:19:48.000000000 +0200
@@ -25,9 +25,9 @@
  jre/lib/[arch]/[client|server]/libjvm.so is used
  and exists under bootstrap/.
  This version of hotspot.stp has been configured to instrument the
- libjvm.so for arch i386 installed at:
- NONE/jre/lib/i386/client/libjvm.so
- NONE/jre/lib/i386/server/libjvm.so
+ libjvm.so for arch amd64 installed at:
+ NONE/jre/lib/amd64/client/libjvm.so
+ NONE/jre/lib/amd64/server/libjvm.so
  
  Each probe defines the probe name and a full probestr which consists
  of the probe name and between brackets all argument names and values.
@@ -38,8 +38,8 @@
  * Sets is_full if this is a full garbage collect.
  */
 probe hotspot.gc_begin =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("gc__begin"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("gc__begin")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("gc__begin"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("gc__begin")
 {
   name = "gc_begin";
   is_full = $arg1;
@@ -51,8 +51,8 @@
    Has no arguments.
  */
 probe hotspot.gc_end =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("gc__end"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("gc__end")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("gc__end"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("gc__end")
 {
   name = "gc_end";
   probestr = name;
@@ -69,8 +69,8 @@
    pages and max to the maximum size of the pool.
  */
 probe hotspot.mem_pool_gc_begin =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("mem__pool__gc__begin"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("mem__pool__gc__begin")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("mem__pool__gc__begin"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("mem__pool__gc__begin")
 {
   name = "mem_pool_gc_begin";
   manager = user_string_n($arg1, $arg2);
@@ -93,8 +93,8 @@
    pages and max to the maximum size of the pool.
  */
 probe hotspot.mem_pool_gc_end =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("mem__pool__gc__end"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("mem__pool__gc__end")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("mem__pool__gc__end"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("mem__pool__gc__end")
 {
   name = "mem_pool_gc_end";
   manager = user_string_n($arg1, $arg2);
@@ -114,8 +114,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.object_alloc =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("object__alloc"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("object__alloc")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("object__alloc"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("object__alloc")
 {
   name = "object_alloc";
   thread_id = $arg1;
@@ -130,8 +130,8 @@
    Has no arguments
  */
 probe hotspot.vm_init_begin =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("vm__init__begin"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("vm__init__begin")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("vm__init__begin"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("vm__init__begin")
 {
   name = "vm_init_begin";
   probestr = name;
@@ -142,8 +142,8 @@
    Has no arguments.
  */
 probe hotspot.vm_init_end =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("vm__init__end"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("vm__init__end")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("vm__init__end"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("vm__init__end")
 {
   name = "vm_init_end";
   probestr = name;
@@ -154,8 +154,8 @@
    Has no arguments.
  */
 probe hotspot.vm_shutdown =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("vm__shutdown"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("vm__shutdown")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("vm__shutdown"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("vm__shutdown")
 {
   name = "vm_shutdown";
   probestr = name;
@@ -168,8 +168,8 @@
    is a daemon thread.
  */
 probe hotspot.thread_start =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("thread__start"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("thread__start")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("thread__start"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("thread__start")
 {
   name = "thread_start";
   thread_name = user_string_n($arg1, $arg2);
@@ -187,8 +187,8 @@
    is a daemon thread.
  */
 probe hotspot.thread_stop =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("thread__stop"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("thread__stop")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("thread__stop"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("thread__stop")
 {
   name = "thread_stop";
   thread_name = user_string_n($arg1, $arg2);
@@ -206,8 +206,8 @@
    class was loaded from a shared archive.
  */
 probe hotspot.class_loaded =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("class__loaded"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("class__loaded")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("class__loaded"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("class__loaded")
 {
   name = "class_loaded";
   class = user_string_n($arg1, $arg2);
@@ -224,8 +224,8 @@
    class was loaded from a shared archive.
  */
 probe hotspot.class_unloaded =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("class__unloaded"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("class__unloaded")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("class__unloaded"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("class__unloaded")
 {
   name = "class_unloaded";
   class = user_string_n($arg1, $arg2);
@@ -242,8 +242,8 @@
    and sig to the signature string of the method.
 */
 probe hotspot.method_compile_begin =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("method__compile__begin"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("method__compile__begin")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("method__compile__begin"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("method__compile__begin")
 {
   name = "method_compile_begin";
   compiler = user_string_n($arg1, $arg2);
@@ -261,8 +261,8 @@
    and sig to the signature string of the method.
 */
 probe hotspot.method_compile_end =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("method__compile__end"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("method__compile__end")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("method__compile__end"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("method__compile__end")
 {
   name = "method_compile_end";
   compiler = user_string_n($arg1, $arg2);
@@ -281,8 +281,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_wait =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__wait"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__wait")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__wait"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__wait")
 {
   name = "monitor_wait";
   thread_id = $arg1;
@@ -300,8 +300,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_waited =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__waited"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__waited")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__waited"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__waited")
 {
   name = "monitor_waited";
   thread_id = $arg1;
@@ -318,8 +318,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_notify =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__notify"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__notify")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__notify"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__notify")
 {
   name = "monitor_notify";
   thread_id = $arg1;
@@ -336,8 +336,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_notifyAll =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__notifyAll"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__notifyAll")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__notifyAll"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__notifyAll")
 {
   name = "monitor_notifyAll";
   thread_id = $arg1;
@@ -357,8 +357,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_contended_enter =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__contended__enter"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__contended__enter")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__contended__enter"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__contended__enter")
 {
   name = "monitor_contended_enter";
   thread_id = $arg1;
@@ -377,8 +377,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_contended_entered =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__contended__entered"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__contended__entered")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__contended__entered"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__contended__entered")
 {
   name = "monitor_contended_entered";
   thread_id = $arg1;
@@ -397,8 +397,8 @@
    Needs -XX:+ExtendedDTraceProbes.
  */
 probe hotspot.monitor_contended_exit =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("monitor__contended__exit"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("monitor__contended__exit")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("monitor__contended__exit"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("monitor__contended__exit")
 {
   name = "monitor_contended_exit";
   thread_id = $arg1;
@@ -416,8 +416,8 @@
    Needs -XX:+ExtendedDTraceProbes.
 */
 probe hotspot.method_entry =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("method__entry"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("method__entry")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("method__entry"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("method__entry")
 {
   name = "method_entry";
   thread_id = $arg1;
@@ -436,8 +436,8 @@
    Needs -XX:+ExtendedDTraceProbes.
 */
 probe hotspot.method_return =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("method__return"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("method__return")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("method__return"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("method__return")
 {
   name = "method_return";
   thread_id = $arg1;
@@ -456,8 +456,8 @@
    code.
 */
 probe hotspot.compiled_method_load =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("compiled__method__load"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("compiled__method__load")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("compiled__method__load"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("compiled__method__load")
 {
   name = "compiled_method_load";
   class = user_string_n($arg1, $arg2);
@@ -475,8 +475,8 @@
    method, sig to the signature string of the method.
 */
 probe hotspot.compiled_method_unload =
-  process("NONE/jre/lib/i386/client/libjvm.so").mark("compiled__method__unload"),
-  process("NONE/jre/lib/i386/server/libjvm.so").mark("compiled__method__unload")
+  process("NONE/jre/lib/amd64/client/libjvm.so").mark("compiled__method__unload"),
+  process("NONE/jre/lib/amd64/server/libjvm.so").mark("compiled__method__unload")
 {
   name = "compiled_method_unload";
   class = user_string_n($arg1, $arg2);