pf2 0.9.0 → 0.11.0

data/lib/pf2/reporter/firefox_profiler_ser2.rb

@@ -2,6 +2,8 @@
 
 require 'json'
 
+require_relative 'stack_weaver'
+
 module Pf2
   module Reporter
     # Generates Firefox Profiler's "processed profile format"
@@ -59,7 +61,7 @@ module Pf2
           counters: [],
           threads: thread_reports,
         }
-        FirefoxProfiler.deep_camelize_keys(report)
+        FirefoxProfilerSer2.deep_camelize_keys(report)
       end
 
       class ThreadReport
@@ -72,6 +74,7 @@ module Pf2
           @stack_tree = { :stack_id => nil }
           @reverse_stack_tree = []
           @string_table = { nil => 0 }
+          @stack_weaver = StackWeaver.new(@profile)
         end
 
         def inspect
@@ -79,9 +82,6 @@ module Pf2
         end
 
         def emit
-          # TODO: weave?
-          # @thread[:stack_tree] = x
-
           # Build func table from profile[:functions]
           func_table = build_func_table
           # Build frame table from profile[:locations]
@@ -136,8 +136,10 @@ module Pf2
           }
 
           @samples.each do |sample|
-            stack = sample[:stack].reverse
-            stack_id = @stack_tree.dig(*stack, :stack_id)
+            # Weave Ruby stack and native stack
+            woven_stack = @stack_weaver.weave(sample[:stack], sample[:native_stack] || [])
+            woven_stack.reverse! # StackWeaver returns in root->leaf order, we need leaf->root
+            stack_id = @stack_tree.dig(*woven_stack, :stack_id)
 
             ret[:stack] << stack_id
             ret[:time] << sample[:elapsed_ns] / 1_000_000 # ns -> ms
@@ -165,9 +167,11 @@ module Pf2
           }
 
           @profile[:locations].each.with_index do |location, i|
+            function = @profile[:functions][location[:function_index]]
+
             ret[:address] << location[:address]
-            ret[:category] << 1
-            ret[:subcategory] << 1
+            ret[:category] << (function[:implementation] == :native ? 3 : 2)
+            ret[:subcategory] << nil
             ret[:func] << location[:function_index]
             ret[:inner_window_id] << nil
             ret[:implementation] << nil
@@ -218,15 +222,15 @@ module Pf2
           }
 
           @profile[:samples].each do |sample|
-            # Stack (Array of location indices) recorded in sample, reversed
-            # example: [1, 2, 9] (1 is the root)
-            stack = sample[:stack].reverse
+            # Weave Ruby stack and native stack
+            woven_stack = @stack_weaver.weave(sample[:stack], sample[:native_stack] || [])
+            woven_stack.reverse! # StackWeaver returns in root->leaf order, we need leaf->root
 
             # Build the stack_table Array which Firefox Profiler requires.
             # At the same time, build the stack tree for efficient traversal.
 
             current_node = @stack_tree # the stack tree root
-            stack.each do |location_index|
+            woven_stack.each do |location_index|
               if current_node[location_index].nil?
                 # The tree node is unknown. Create it.
                 new_stack_id = ret[:frame].length # The position of the new stack in the stack_table array
@@ -238,7 +242,7 @@ module Pf2
 
                 # Register the stack in the stack_table Array
                 ret[:frame] << location_index
-                ret[:category] << (function[:implementation] == :ruby ? 2 : 1)
+                ret[:category] << (function[:implementation] == :native ? 3 : 2)
                 ret[:subcategory] << nil
                 ret[:prefix] << current_node[:stack_id] # the parent's position in the stack_table array
               end

data/lib/pf2/reporter/stack_weaver.rb

@@ -2,6 +2,14 @@
 
 module Pf2
   module Reporter
+    # "Weaves" the native stack into the Ruby stack.
+    #
+    # Strategy:
+    # - Split the stack into Ruby and Native parts
+    # - Start from the root of the Native stack
+    # - Dig in to the native stack until we hit a rb_vm_exec(), which marks a call into Ruby code
+    # - Switch to Ruby stack. Keep digging until we hit a Cfunc call, then switch back to Native stack
+    # - Repeat until we consume the entire stack
     class StackWeaver
       def initialize(profile)
         @profile = profile
@@ -74,7 +82,7 @@ module Pf2
 
         # If the next function is a vm_exec_core() (= VM_EXEC in vm_exec.h),
         # we switch to the Ruby stack.
-        function[:name] == 'vm_exec_core'
+        function[:name]&.match?(/\Avm_exec_core(?:\.lto_priv\.\d+)?\z/)
       end
     end
   end

data/lib/pf2/reporter.rb

@@ -2,5 +2,4 @@
 
 require_relative './reporter/annotate'
 require_relative './reporter/stack_weaver'
-require_relative './reporter/firefox_profiler'
 require_relative './reporter/firefox_profiler_ser2'

data/lib/pf2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pf2
-  VERSION = '0.9.0'
+  VERSION = '0.11.0'
 end

data/lib/pf2.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require_relative 'pf2/pf2'
-require_relative 'pf2/session'
 require_relative 'pf2/version'
 
 module Pf2
   class Error < StandardError; end
 
   def self.start(...)
-    @@session = Pf2::Session.new(...)
+    @@session = Session.new(...)
     @@session.start
   end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pf2
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Daisuke Aritomo
 bindir: exe
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_portile2
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,19 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb_sys
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.105
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.105
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - osyoyu@osyoyu.com
 executables:
@@ -101,142 +115,40 @@ extensions:
 - ext/pf2/extconf.rb
 extra_rdoc_files: []
 files:
+- ".document"
+- ".rdoc_options"
 - CHANGELOG.md
-- Cargo.lock
-- Cargo.toml
 - LICENSE.txt
 - README.md
 - Rakefile
-- crates/backtrace-sys2/.gitignore
-- crates/backtrace-sys2/Cargo.toml
-- crates/backtrace-sys2/build.rs
-- crates/backtrace-sys2/src/lib.rs
-- crates/backtrace-sys2/src/libbacktrace/.gitignore
-- crates/backtrace-sys2/src/libbacktrace/Isaac.Newton-Opticks.txt
-- crates/backtrace-sys2/src/libbacktrace/LICENSE
-- crates/backtrace-sys2/src/libbacktrace/Makefile.am
-- crates/backtrace-sys2/src/libbacktrace/Makefile.in
-- crates/backtrace-sys2/src/libbacktrace/README.md
-- crates/backtrace-sys2/src/libbacktrace/aclocal.m4
-- crates/backtrace-sys2/src/libbacktrace/alloc.c
-- crates/backtrace-sys2/src/libbacktrace/allocfail.c
-- crates/backtrace-sys2/src/libbacktrace/allocfail.sh
-- crates/backtrace-sys2/src/libbacktrace/atomic.c
-- crates/backtrace-sys2/src/libbacktrace/backtrace-supported.h.in
-- crates/backtrace-sys2/src/libbacktrace/backtrace.c
-- crates/backtrace-sys2/src/libbacktrace/backtrace.h
-- crates/backtrace-sys2/src/libbacktrace/btest.c
-- crates/backtrace-sys2/src/libbacktrace/compile
-- crates/backtrace-sys2/src/libbacktrace/config.guess
-- crates/backtrace-sys2/src/libbacktrace/config.h.in
-- crates/backtrace-sys2/src/libbacktrace/config.sub
-- crates/backtrace-sys2/src/libbacktrace/config/enable.m4
-- crates/backtrace-sys2/src/libbacktrace/config/lead-dot.m4
-- crates/backtrace-sys2/src/libbacktrace/config/libtool.m4
-- crates/backtrace-sys2/src/libbacktrace/config/ltoptions.m4
-- crates/backtrace-sys2/src/libbacktrace/config/ltsugar.m4
-- crates/backtrace-sys2/src/libbacktrace/config/ltversion.m4
-- crates/backtrace-sys2/src/libbacktrace/config/lt~obsolete.m4
-- crates/backtrace-sys2/src/libbacktrace/config/multi.m4
-- crates/backtrace-sys2/src/libbacktrace/config/override.m4
-- crates/backtrace-sys2/src/libbacktrace/config/unwind_ipinfo.m4
-- crates/backtrace-sys2/src/libbacktrace/config/warnings.m4
-- crates/backtrace-sys2/src/libbacktrace/configure
-- crates/backtrace-sys2/src/libbacktrace/configure.ac
-- crates/backtrace-sys2/src/libbacktrace/dwarf.c
-- crates/backtrace-sys2/src/libbacktrace/edtest.c
-- crates/backtrace-sys2/src/libbacktrace/edtest2.c
-- crates/backtrace-sys2/src/libbacktrace/elf.c
-- crates/backtrace-sys2/src/libbacktrace/fileline.c
-- crates/backtrace-sys2/src/libbacktrace/filenames.h
-- crates/backtrace-sys2/src/libbacktrace/filetype.awk
-- crates/backtrace-sys2/src/libbacktrace/install-debuginfo-for-buildid.sh.in
-- crates/backtrace-sys2/src/libbacktrace/install-sh
-- crates/backtrace-sys2/src/libbacktrace/instrumented_alloc.c
-- crates/backtrace-sys2/src/libbacktrace/internal.h
-- crates/backtrace-sys2/src/libbacktrace/ltmain.sh
-- crates/backtrace-sys2/src/libbacktrace/macho.c
-- crates/backtrace-sys2/src/libbacktrace/missing
-- crates/backtrace-sys2/src/libbacktrace/mmap.c
-- crates/backtrace-sys2/src/libbacktrace/mmapio.c
-- crates/backtrace-sys2/src/libbacktrace/move-if-change
-- crates/backtrace-sys2/src/libbacktrace/mtest.c
-- crates/backtrace-sys2/src/libbacktrace/nounwind.c
-- crates/backtrace-sys2/src/libbacktrace/pecoff.c
-- crates/backtrace-sys2/src/libbacktrace/posix.c
-- crates/backtrace-sys2/src/libbacktrace/print.c
-- crates/backtrace-sys2/src/libbacktrace/read.c
-- crates/backtrace-sys2/src/libbacktrace/simple.c
-- crates/backtrace-sys2/src/libbacktrace/sort.c
-- crates/backtrace-sys2/src/libbacktrace/state.c
-- crates/backtrace-sys2/src/libbacktrace/stest.c
-- crates/backtrace-sys2/src/libbacktrace/test-driver
-- crates/backtrace-sys2/src/libbacktrace/test_format.c
-- crates/backtrace-sys2/src/libbacktrace/testlib.c
-- crates/backtrace-sys2/src/libbacktrace/testlib.h
-- crates/backtrace-sys2/src/libbacktrace/ttest.c
-- crates/backtrace-sys2/src/libbacktrace/unittest.c
-- crates/backtrace-sys2/src/libbacktrace/unknown.c
-- crates/backtrace-sys2/src/libbacktrace/xcoff.c
-- crates/backtrace-sys2/src/libbacktrace/xztest.c
-- crates/backtrace-sys2/src/libbacktrace/zstdtest.c
-- crates/backtrace-sys2/src/libbacktrace/ztest.c
 - doc/development.md
 - examples/mandelbrot.rb
 - examples/mandelbrot_ractor.rb
 - exe/pf2
-- ext/pf2/Cargo.toml
-- ext/pf2/build.rs
+- ext/pf2/backtrace_state.c
+- ext/pf2/backtrace_state.h
+- ext/pf2/configuration.c
+- ext/pf2/configuration.h
+- ext/pf2/debug.h
 - ext/pf2/extconf.rb
-- ext/pf2/src/backtrace.rs
-- ext/pf2/src/lib.rs
-- ext/pf2/src/profile.rs
-- ext/pf2/src/profile_serializer.rs
-- ext/pf2/src/ringbuffer.rs
-- ext/pf2/src/ruby_c_api_helper.c
-- ext/pf2/src/ruby_init.rs
-- ext/pf2/src/ruby_internal_apis.rs
-- ext/pf2/src/sample.rs
-- ext/pf2/src/scheduler.rs
-- ext/pf2/src/serialization.rs
-- ext/pf2/src/serialization/profile.rs
-- ext/pf2/src/serialization/serializer.rs
-- ext/pf2/src/session.rs
-- ext/pf2/src/session/configuration.rs
-- ext/pf2/src/session/new_thread_watcher.rs
-- ext/pf2/src/session/ruby_object.rs
-- ext/pf2/src/siginfo_t.c
-- ext/pf2/src/signal_scheduler.rs
-- ext/pf2/src/signal_scheduler_unsupported_platform.rs
-- ext/pf2/src/timer_thread_scheduler.rs
-- ext/pf2/src/util.rs
-- ext/pf2c/backtrace_state.c
-- ext/pf2c/backtrace_state.h
-- ext/pf2c/configuration.c
-- ext/pf2c/configuration.h
-- ext/pf2c/extconf.rb
-- ext/pf2c/pf2.c
-- ext/pf2c/pf2.h
-- ext/pf2c/ringbuffer.c
-- ext/pf2c/ringbuffer.h
-- ext/pf2c/sample.c
-- ext/pf2c/sample.h
-- ext/pf2c/serializer.c
-- ext/pf2c/serializer.h
-- ext/pf2c/session.c
-- ext/pf2c/session.h
+- ext/pf2/pf2.c
+- ext/pf2/pf2.h
+- ext/pf2/ringbuffer.c
+- ext/pf2/ringbuffer.h
+- ext/pf2/sample.c
+- ext/pf2/sample.h
+- ext/pf2/serializer.c
+- ext/pf2/serializer.h
+- ext/pf2/session.c
+- ext/pf2/session.h
 - lib/pf2.rb
 - lib/pf2/cli.rb
 - lib/pf2/reporter.rb
 - lib/pf2/reporter/annotate.rb
-- lib/pf2/reporter/firefox_profiler.rb
 - lib/pf2/reporter/firefox_profiler_ser2.rb
 - lib/pf2/reporter/stack_weaver.rb
 - lib/pf2/serve.rb
-- lib/pf2/session.rb
 - lib/pf2/version.rb
-- rust-toolchain.toml
-- rustfmt.toml
 - vendor/libbacktrace/.gitignore
 - vendor/libbacktrace/Isaac.Newton-Opticks.txt
 - vendor/libbacktrace/LICENSE
@@ -329,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Yet another Ruby profiler
 test_files: []