pf2 0.13.0 → 1.0.0.alpha1

data/ext/pf2/session.h

@@ -3,8 +3,6 @@
 
 #include <pthread.h>
 #include <stdatomic.h>
-#include <stdint.h>
-#include <limits.h>
 #include <sys/time.h>
 
 #include <ruby.h>
@@ -13,152 +11,6 @@
 #include "ringbuffer.h"
 #include "sample.h"
 
-#include "khashl.h"
-
-// Maps for sample storage
-
-// BEGIN generic helpers
-
-static inline khint_t hash_size_t(size_t v)
-{
-#if SIZE_MAX == UINT_MAX
-    return kh_hash_uint32((khint_t)v);
-#else
-    return kh_hash_uint64((khint64_t)v);
-#endif
-}
-static inline int eq_size_t(size_t a, size_t b) { return a == b; }
-
-// END generic helpers
-
-// BEGIN location_table
-
-struct pf2_location_key {
-    VALUE cme;
-    int lineno;
-};
-static inline khint_t hash_location_key(struct pf2_location_key key)
-{
-    khint_t h = hash_size_t((size_t)key.cme);
-    h ^= (khint_t)key.lineno + 0x9e3779b9U + (h << 6) + (h >> 2);
-    return h;
-}
-static inline int eq_location_key(struct pf2_location_key a, struct pf2_location_key b)
-{
-    return a.cme == b.cme && a.lineno == b.lineno;
-}
-
-// END location_table
-
-// BEGIN stack_table (Ruby stack)
-
-struct pf2_stack_key {
-    const size_t *frames; // pointer to an immutable array of location_ids
-    size_t depth;
-};
-static inline khint_t hash_stack_key(struct pf2_stack_key key)
-{
-    khint_t h = hash_size_t(key.depth);
-    for (size_t i = 0; i < key.depth; i++) {
-        h ^= hash_size_t(key.frames[i]) + 0x9e3779b9U + (h << 6) + (h >> 2);
-    }
-    return h;
-}
-static inline int eq_stack_key(struct pf2_stack_key a, struct pf2_stack_key b)
-{
-    if (a.depth != b.depth) return 0;
-    for (size_t i = 0; i < a.depth; i++) {
-        if (a.frames[i] != b.frames[i]) return 0;
-    }
-    return 1;
-}
-
-// END stack_table
-
-// BEGIN native_stack_table (raw PCs)
-
-struct pf2_native_stack_key {
-    const uintptr_t *frames; // pointer to an immutable array of PCs
-    size_t depth;
-};
-static inline khint_t hash_native_stack_key(struct pf2_native_stack_key key)
-{
-    khint_t h = hash_size_t(key.depth);
-    for (size_t i = 0; i < key.depth; i++) {
-        h ^= kh_hash_uint64((khint64_t)key.frames[i]) + 0x9e3779b9U + (h << 6) + (h >> 2);
-    }
-    return h;
-}
-static inline int eq_native_stack_key(struct pf2_native_stack_key a, struct pf2_native_stack_key b)
-{
-    if (a.depth != b.depth) return 0;
-    for (size_t i = 0; i < a.depth; i++) {
-        if (a.frames[i] != b.frames[i]) return 0;
-    }
-    return 1;
-}
-
-// END native_stack_table
-
-// BEGIN combined_sample_table
-
-struct pf2_combined_stack_key {
-    size_t ruby_stack_id;
-    size_t native_stack_id;
-};
-static inline khint_t hash_combined_stack_key(struct pf2_combined_stack_key key)
-{
-    khint_t h = hash_size_t(key.ruby_stack_id);
-    h ^= hash_size_t(key.native_stack_id) + 0x9e3779b9U + (h << 6) + (h >> 2);
-    return h;
-}
-static inline int eq_combined_stack_key(struct pf2_combined_stack_key a, struct pf2_combined_stack_key b)
-{
-    return a.ruby_stack_id == b.ruby_stack_id && a.native_stack_id == b.native_stack_id;
-}
-
-// END combined_sample_table
-
-struct pf2_sample_stats {
-    // The number of times this sample was observed.
-    size_t count;
-    // Timestamps which this sample was observed. This array's length = # of samples.
-    // TODO: Make timestamp collection optional?
-    uint64_t *timestamps;
-    // Thread ids corresponding to each timestamp.
-    uintptr_t *thread_ids;
-    // timestamps.length
-    size_t timestamps_count;
-    size_t timestamps_capacity;
-};
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-// location table: key = (cme, lineno), val = location_id
-KHASHL_MAP_INIT(static, pf2_location_table, pf2_location_table, struct pf2_location_key, size_t, hash_location_key, eq_location_key)
-// stack table: key = array of location_ids, val = stack_id
-KHASHL_MAP_INIT(static, pf2_stack_table, pf2_stack_table, struct pf2_stack_key, size_t, hash_stack_key, eq_stack_key)
-// native stack table: key = array of PCs, val = native_stack_id
-KHASHL_MAP_INIT(static, pf2_native_stack_table, pf2_native_stack_table, struct pf2_native_stack_key, size_t, hash_native_stack_key, eq_native_stack_key)
-// sample table: key = (ruby_stack_id, native_stack_id), val = aggregated counts/timestamps
-KHASHL_MAP_INIT(static, pf2_sample_table, pf2_sample_table, struct pf2_combined_stack_key, struct pf2_sample_stats, hash_combined_stack_key, eq_combined_stack_key)
-#pragma GCC diagnostic pop
-
-struct pf2_sess_sample {
-    size_t *stack; // array of location_indexes
-    size_t stack_count;
-    size_t *native_stack; // array of location_indexes
-    size_t native_stack_count;
-    uintptr_t ruby_thread_id;
-    uint64_t elapsed_ns;
-};
-
-struct pf2_sess_location {
-    size_t function_index;
-    int32_t lineno;
-    size_t address;
-};
-
 struct pf2_session {
     bool is_running;
 #ifdef HAVE_TIMER_CREATE
@@ -170,18 +22,14 @@ struct pf2_session {
     atomic_bool is_marking; // Whether garbage collection is in progress
     pthread_t *collector_thread;
 
-    pf2_location_table *location_table;
-    pf2_stack_table *stack_table;
-    pf2_native_stack_table *native_stack_table;
-    pf2_sample_table *sample_table;
+    struct pf2_sample *samples; // Dynamic array of samples
+    size_t samples_index;
+    size_t samples_capacity;    // Current capacity of the samples array
 
     struct timespec start_time_realtime;
     struct timespec start_time; // When profiling started
     uint64_t duration_ns; // Duration of profiling in nanoseconds
 
-    atomic_uint_fast64_t collected_sample_count; // Number of samples copied out of the ringbuffer
-    atomic_uint_fast64_t dropped_sample_count; // Number of samples dropped for any reason
-
     struct pf2_configuration *configuration;
 };
 
@@ -195,14 +43,14 @@ void pf2_session_dfree(void *sess);
 size_t pf2_session_dsize(const void *sess);
 
 static const rb_data_type_t pf2_session_type = {
-    .wrap_struct_name = "Pf2::Session",
+    .wrap_struct_name = "Pf2c::Session",
     .function = {
         .dmark = pf2_session_dmark,
         .dfree = pf2_session_dfree,
         .dsize = pf2_session_dsize,
     },
     .data = NULL,
-    .flags = 0,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 #endif // PF2_SESSION_H

data/lib/pf2/cli.rb

@@ -26,7 +26,7 @@ module Pf2
       when 'version'
         puts VERSION
         return 0
-      when nil, '--help'
+      when '--help'
         STDERR.puts <<~__EOS__
         Usage: #{program_name} COMMAND [options]
 

data/lib/pf2/reporter/stack_weaver.rb

@@ -82,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]&.match?(/\Avm_exec_core(?:\.lto_priv\.\d+)?\z/)
+        function[:name] == 'vm_exec_core'
       end
     end
   end

data/lib/pf2/serve.rb

@@ -27,9 +27,10 @@ module Pf2
       server = WEBrick::HTTPServer.new(CONFIG)
       server.mount_proc('/profile') do |req, res|
         profile = Pf2.stop
+        profile = JSON.parse(profile, symbolize_names: true, max_nesting: false)
         res.header['Content-Type'] = 'application/json'
         res.header['Access-Control-Allow-Origin'] = '*'
-        res.body = JSON.generate(Pf2::Reporter::FirefoxProfilerSer2.new(profile).emit)
+        res.body = JSON.generate(Pf2::Reporter::FirefoxProfiler.new((profile)).emit)
         Pf2.start
       end
 

data/lib/pf2/session.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Pf2
+  class Session
+    attr_reader :configuration
+
+    # Implementation is in Rust code.
+  end
+end

data/lib/pf2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pf2
-  VERSION = '0.13.0'
+  VERSION = '1.0.0.alpha1'
 end

data/lib/pf2.rb

@@ -1,13 +1,14 @@
 # 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 = Session.new(...)
+    @@session = Pf2c::Session.new(...)
     @@session.start
   end
 
@@ -15,25 +16,12 @@ module Pf2
     @@session.stop
   end
 
-  # Profiles the given block of code.
-  #
-  # Example:
-  #
-  #     profile = Pf2.profile(interval_ms: 42) do
-  #       your_code_here
-  #     end
-  #
-  def self.profile(**kwargs, &block)
+  def self.profile(&block)
     raise ArgumentError, "block required" unless block_given?
-    start(**kwargs)
+    start(threads: Thread.list)
     yield
     result = stop
     @@session = nil # let GC clean up the session
     result
-  ensure
-    if defined?(@@session) && @@session != nil
-      stop
-      @@session = nil
-    end
   end
 end

data/vendor/libbacktrace/atomic.c

@@ -103,7 +103,7 @@ backtrace_atomic_store_size_t (size_t *p, size_t v)
 void
 backtrace_atomic_store_int (int *p, int v)
 {
-  int old;
+  size_t old;
 
   old = *p;
   while (!__sync_bool_compare_and_swap (p, old, v))

data/vendor/libbacktrace/configure

@@ -812,7 +812,6 @@ enable_darwin_at_rpath
 enable_largefile
 enable_werror
 with_system_libunwind
-enable_host_pie
 enable_host_shared
 '
       ac_precious_vars='build_alias
@@ -1462,7 +1461,6 @@ Optional Features:
                           rpaths to be added to executables
   --disable-largefile     omit support for large files
   --disable-werror        disable building with -Werror
-  --enable-host-pie       build host code as PIE
   --enable-host-shared    build host code as shared libraries
 
 Optional Packages:
@@ -11397,7 +11395,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11400 "configure"
+#line 11398 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11503,7 +11501,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11506 "configure"
+#line 11504 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12192,18 +12190,12 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
   fi
 fi
 
-# Enable --enable-host-pie.
-# Check whether --enable-host-pie was given.
-if test "${enable_host_pie+set}" = set; then :
-  enableval=$enable_host_pie; PIC_FLAG=-fPIE
-else
-  PIC_FLAG=
-fi
-
 # Enable --enable-host-shared.
 # Check whether --enable-host-shared was given.
 if test "${enable_host_shared+set}" = set; then :
   enableval=$enable_host_shared; PIC_FLAG=-fPIC
+else
+  PIC_FLAG=
 fi
 
 

data/vendor/libbacktrace/configure.ac

@@ -176,16 +176,11 @@ else
   fi
 fi
 
-# Enable --enable-host-pie.
-AC_ARG_ENABLE(host-pie,
-[AS_HELP_STRING([--enable-host-pie],
-                [build host code as PIE])],
-[PIC_FLAG=-fPIE], [PIC_FLAG=])
 # Enable --enable-host-shared.
 AC_ARG_ENABLE(host-shared,
 [AS_HELP_STRING([--enable-host-shared],
 		[build host code as shared libraries])],
-[PIC_FLAG=-fPIC])
+[PIC_FLAG=-fPIC], [PIC_FLAG=])
 AC_SUBST(PIC_FLAG)
 
 # Test for __sync support.

data/vendor/libbacktrace/elf.c

@@ -160,10 +160,10 @@ dl_iterate_phdr (int (*callback) (struct dl_phdr_info *,
 #undef EI_CLASS
 #undef EI_DATA
 #undef EI_VERSION
-#undef ELFMAG0
-#undef ELFMAG1
-#undef ELFMAG2
-#undef ELFMAG3
+#undef ELF_MAG0
+#undef ELF_MAG1
+#undef ELF_MAG2
+#undef ELF_MAG3
 #undef ELFCLASS32
 #undef ELFCLASS64
 #undef ELFDATA2LSB

data/vendor/libbacktrace/fileline.c

@@ -47,10 +47,6 @@ POSSIBILITY OF SUCH DAMAGE.  */
 #include <mach-o/dyld.h>
 #endif
 
-#ifdef __hpux__
-#include <dl.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -70,33 +66,6 @@ POSSIBILITY OF SUCH DAMAGE.  */
 #define getexecname() NULL
 #endif
 
-#ifdef __hpux__
-static char *
-hpux_get_executable_path (struct backtrace_state *state,
-			  backtrace_error_callback error_callback, void *data)
-{
-  struct shl_descriptor *desc;
-  size_t len = sizeof (struct shl_descriptor);
-
-  desc = backtrace_alloc (state, len, error_callback, data);
-  if (desc == NULL)
-    return NULL;
-
-  if (shl_get_r (0, desc) == -1)
-    {
-      backtrace_free (state, desc, len, error_callback, data);
-      return NULL;
-    }
-
-  return desc->filename;
-}
-
-#else
-
-#define hpux_get_executable_path(state, error_callback, data) NULL
-
-#endif
-
 #if !defined (HAVE_KERN_PROC_ARGS) && !defined (HAVE_KERN_PROC)
 
 #define sysctl_exec_name1(state, error_callback, data) NULL
@@ -276,7 +245,7 @@ fileline_initialize (struct backtrace_state *state,
 
   descriptor = -1;
   called_error_callback = 0;
-  for (pass = 0; pass < 11; ++pass)
+  for (pass = 0; pass < 10; ++pass)
     {
       int does_not_exist;
 
@@ -316,9 +285,6 @@ fileline_initialize (struct backtrace_state *state,
 	case 9:
 	  filename = windows_get_executable_path (buf, error_callback, data);
 	  break;
-	case 10:
-	  filename = hpux_get_executable_path (state, error_callback, data);
-	  break;
 	default:
 	  abort ();
 	}

data/vendor/libbacktrace/filetype.awk

@@ -3,7 +3,6 @@
 /^\177ELF\002/      { if (NR == 1) { print "elf64"; exit } }
 /^\114\001/         { if (NR == 1) { print "pecoff"; exit } }
 /^\144\206/         { if (NR == 1) { print "pecoff"; exit } }
-/^\000\000\377\377/ { if (NR == 1) { print "pecoff"; exit } }
 /^\001\337/         { if (NR == 1) { print "xcoff32"; exit } }
 /^\001\367/         { if (NR == 1) { print "xcoff64"; exit } }
 /^\376\355\372\316/ { if (NR == 1) { print "macho"; exit } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pf2
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.0.0.alpha1
 platform: ruby
 authors:
 - Daisuke Aritomo
@@ -9,20 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +79,6 @@ 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:
@@ -115,25 +87,20 @@ extensions:
 - ext/pf2/extconf.rb
 extra_rdoc_files: []
 files:
-- ".document"
-- ".rdoc_options"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
-- THIRD_PARTY_LICENSES.txt
 - doc/development.md
 - examples/mandelbrot.rb
 - examples/mandelbrot_ractor.rb
 - exe/pf2
-- ext/patches/libbacktrace/0001-Support-MACH_O_MH_BUNDLE.patch
 - 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/khashl.h
 - ext/pf2/pf2.c
 - ext/pf2/pf2.h
 - ext/pf2/ringbuffer.c
@@ -151,6 +118,7 @@ files:
 - 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
 - vendor/libbacktrace/.gitignore
 - vendor/libbacktrace/Isaac.Newton-Opticks.txt
@@ -244,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: Yet another Ruby profiler
 test_files: []

data/.document

@@ -1,3 +0,0 @@
-ext/
-lib/
-*.md

data/.rdoc_options

@@ -1,6 +0,0 @@
-title: Pf2
-main_page: README.md
-encoding: UTF-8
-
-autolink_excluded_words:
-  - Pf2

data/THIRD_PARTY_LICENSES.txt

@@ -1,59 +0,0 @@
-This project includes the following third-party software:
-
-## khashl
-
-    The MIT License
-
-    Copyright (c) 2019- by Attractive Chaos <attractor@live.co.uk>
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-    BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-    ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
-## libbacktrace
-
-    Copyright (C) 2012-2016 Free Software Foundation, Inc.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        (1) Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer. 
-
-        (2) Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in
-        the documentation and/or other materials provided with the
-        distribution.  
-
-        (3) The name of the author may not be used to
-        endorse or promote products derived from this software without
-        specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.

data/ext/patches/libbacktrace/0001-Support-MACH_O_MH_BUNDLE.patch

@@ -1,32 +0,0 @@
-From 4cd047583bc48ad0617fb6c036174de062573e68 Mon Sep 17 00:00:00 2001
-From: Daisuke Aritomo <osyoyu@osyoyu.com>
-Date: Wed, 7 Jan 2026 02:50:54 +0900
-Subject: [PATCH] Support MACH_O_MH_BUNDLE
-
----
- macho.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/macho.c b/macho.c
-index 9f8738d..5ea07ae 100644
---- a/macho.c
-+++ b/macho.c
-@@ -92,6 +92,7 @@ struct macho_header_fat
- 
- #define MACH_O_MH_EXECUTE	0x02
- #define MACH_O_MH_DYLIB		0x06
-+#define MACH_O_MH_BUNDLE	0x08
- #define MACH_O_MH_DSYM		0x0a
- 
- /* A component of a fat file.  A fat file starts with a
-@@ -1062,6 +1063,7 @@ macho_add (struct backtrace_state *state, const char *filename, int descriptor,
-     {
-     case MACH_O_MH_EXECUTE:
-     case MACH_O_MH_DYLIB:
-+    case MACH_O_MH_BUNDLE:
-     case MACH_O_MH_DSYM:
-       break;
-     default:
--- 
-2.39.5 (Apple Git-154)
-