Add support for jcmd Compiler.perfmap

Even though the perf "spec" for jit languages defines the perf map syntax, the jcmd Compiler.perfmap insists on prepending 0x to the addresses. In addition, there's now a way for the jvm to generate the perfmap automatically on exit, making `magic-trace run -multi-thread -snapshot-size 1M -- ./demo/java` return something useful without messing around with perfmap generation. Add these options to the ./demo/java file Signed-off-by: Theodor Thornhill <[email protected]>
janestreet · May 31, 2024 · a8d3a3c · a8d3a3c
1 parent 968ffea
commit a8d3a3c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.ocamlformat b/.ocamlformat
@@ -1,2 +1,2 @@
-version=0.26.1
+version=0.26.2
 profile=janestreet
diff --git a/core/perf_map.ml b/core/perf_map.ml
@@ -9,7 +9,7 @@ let perf_map_re =
      Not every runtime contains the file and line, so let's just call all of that stuff the name.
      That matches the spec linked in the mli.
   *)
-  Re.Posix.re {|^([0-9a-fA-F]+) ([0-9a-fA-F]+) (.*)$|} |> Re.compile
+  Re.Posix.re {|^(0x)?([0-9a-fA-F]+) (0x)?([0-9a-fA-F]+) (.*)$|} |> Re.compile
 ;;
 
 let parse_line line =
@@ -19,7 +19,7 @@ let parse_line line =
   else (
     try
       match Re.Group.all (Re.exec perf_map_re line) with
-      | [| _; start_addr; size; function_ |] ->
+      | [| _; _; start_addr; _; size; function_ |] ->
         let start_addr = Util.int64_of_hex_string start_addr in
         ( start_addr
         , { Perf_map_location.start_addr
@@ -55,6 +55,9 @@ let%test_module _ =
 3a6caa5241e cfd LazyCompile:~formatRaw node:internal/util/inspect:820
 3a6caa537c6 13f LazyCompile:~getConstructorName node:internal/util/inspect:567
 3a6caa53a96 d LazyCompile:~isInstanceof node:internal/util/inspect:559
+0x000075595c6a34a0 0x0000000000000170 long java.util.Spliterator.getExactSizeIfKnown()
+0x00007afaa486ce20 0x00000000000000c8 com.fasterxml.jackson.core.JsonToken com.fasterxml.jackson.core.base.ParserMinimalBase.currentToken()
+0x00007557305a01a0 0x00000000000001f8 boolean jdk.internal.misc.Unsafe.compareAndSetLong(java.lang.Object, long, long, long)
 00007F5D97BCAE50 22 instance void [System.Private.CoreLib] System.Collections.Generic.Dictionary`2[System.__Canon,System.Double]::.ctor()[QuickJitted]
 00007F5D97BCAD40 10 stub<1023> AllocateTemporaryEntryPoints<PRECODE_FIXUP>
 00007F5D97BCAD58 48 stub<1024> AllocateTemporaryEntryPoints<PRECODE_FIXUP>
@@ -117,6 +120,20 @@ let%test_module _ =
           ((0x3a6caa53a96
             ((start_addr 0x3a6caa53a96) (size 0xd)
              (function_ "LazyCompile:~isInstanceof node:internal/util/inspect:559")))))
+         ("0x000075595c6a34a0 0x0000000000000170 long java.util.Spliterator.getExactSizeIfKnown()"
+          ((0x75595c6a34a0
+            ((start_addr 0x75595c6a34a0) (size 0x170)
+             (function_ "long java.util.Spliterator.getExactSizeIfKnown()")))))
+         ("0x00007afaa486ce20 0x00000000000000c8 com.fasterxml.jackson.core.JsonToken com.fasterxml.jackson.core.base.ParserMinimalBase.currentToken()"
+          ((0x7afaa486ce20
+            ((start_addr 0x7afaa486ce20) (size 0xc8)
+             (function_
+              "com.fasterxml.jackson.core.JsonToken com.fasterxml.jackson.core.base.ParserMinimalBase.currentToken()")))))
+         ("0x00007557305a01a0 0x00000000000001f8 boolean jdk.internal.misc.Unsafe.compareAndSetLong(java.lang.Object, long, long, long)"
+          ((0x7557305a01a0
+            ((start_addr 0x7557305a01a0) (size 0x1f8)
+             (function_
+              "boolean jdk.internal.misc.Unsafe.compareAndSetLong(java.lang.Object, long, long, long)")))))
          ("00007F5D97BCAE50 22 instance void [System.Private.CoreLib] System.Collections.Generic.Dictionary`2[System.__Canon,System.Double]::.ctor()[QuickJitted]"
           ((0x7f5d97bcae50
             ((start_addr 0x7f5d97bcae50) (size 0x22)

diff --git a/core/trace_filter.ml b/core/trace_filter.ml
@@ -32,6 +32,6 @@ let param =
     (optional Unevaluated.arg_type)
     ~doc:
       "_ [-filter \"(<START> <STOP>)\"] restricts the output of magic-trace to events \
-       occurring between consecutive occurrences of START and STOP. If either function is \
-       not called in the trace, no output will be produced."
+       occurring between consecutive occurrences of START and STOP. If either function \
+       is not called in the trace, no output will be produced."
 ;;
diff --git a/demo/java b/demo/java
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S java --source 11
+#!/usr/bin/env -S java -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:+DumpPerfMapAtExit -XX:+PreserveFramePointer --source 17
 
 import java.io.FileReader;
 import java.io.FileWriter;