pf2 0.2.0 → 0.3.0

data/ext/pf2/src/timer_thread_scheduler.rs

@@ -1,6 +1,6 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 
-use std::ffi::{c_void, CString};
+use std::ffi::{c_int, c_void, CStr, CString};
 use std::mem::ManuallyDrop;
 use std::ptr::null_mut;
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -18,6 +18,7 @@ use crate::util::*;
 #[derive(Clone, Debug)]
 pub struct TimerThreadScheduler {
     ruby_threads: Arc<RwLock<Vec<VALUE>>>,
+    interval: Option<Arc<Duration>>,
     profile: Option<Arc<RwLock<Profile>>>,
     stop_requested: Arc<AtomicBool>,
 }
@@ -32,26 +33,89 @@ impl TimerThreadScheduler {
     fn new() -> Self {
         TimerThreadScheduler {
             ruby_threads: Arc::new(RwLock::new(vec![])),
+            interval: None,
             profile: None,
             stop_requested: Arc::new(AtomicBool::new(false)),
         }
     }
 
-    fn start(&mut self, _rbself: VALUE, ruby_threads: VALUE) -> VALUE {
-        // Register threads
-        let stored_threads = &mut self.ruby_threads.try_write().unwrap();
+    fn initialize(&mut self, argc: c_int, argv: *const VALUE, _rbself: VALUE) -> VALUE {
+        // Parse arguments
+        let kwargs: VALUE = Qnil.into();
         unsafe {
-            for i in 0..RARRAY_LEN(ruby_threads) {
-                stored_threads.push(rb_ary_entry(ruby_threads, i));
+            rb_scan_args(argc, argv, cstr!(":"), &kwargs);
+        };
+        let mut kwargs_values: [VALUE; 3] = [Qnil.into(); 3];
+        unsafe {
+            rb_get_kwargs(
+                kwargs,
+                [
+                    rb_intern(cstr!("interval_ms")),
+                    rb_intern(cstr!("threads")),
+                    rb_intern(cstr!("time_mode")),
+                ]
+                .as_mut_ptr(),
+                0,
+                3,
+                kwargs_values.as_mut_ptr(),
+            );
+        };
+        let interval: Duration = if kwargs_values[0] != Qundef as VALUE {
+            let interval_ms = unsafe { rb_num2long(kwargs_values[0]) };
+            Duration::from_millis(interval_ms.try_into().unwrap_or_else(|_| {
+                eprintln!(
+                    "[Pf2] Warning: Specified interval ({}) is not valid. Using default value (49ms).",
+                    interval_ms
+                );
+                49
+            }))
+        } else {
+            Duration::from_millis(49)
+        };
+        let threads: VALUE = if kwargs_values[1] != Qundef as VALUE {
+            kwargs_values[1]
+        } else {
+            unsafe { rb_funcall(rb_cThread, rb_intern(cstr!("list")), 0) }
+        };
+        if kwargs_values[2] != Qundef as VALUE {
+            let specified_mode = unsafe {
+                let mut str = rb_funcall(kwargs_values[2], rb_intern(cstr!("to_s")), 0);
+                let ptr = rb_string_value_ptr(&mut str);
+                CStr::from_ptr(ptr).to_str().unwrap()
+            };
+            if specified_mode != "wall" {
+                // Raise an ArgumentError
+                unsafe {
+                    rb_raise(
+                        rb_eArgError,
+                        cstr!("TimerThreadScheduler only supports :wall mode."),
+                    )
+                }
             }
         }
 
+        let mut target_ruby_threads = Vec::new();
+        unsafe {
+            for i in 0..RARRAY_LEN(threads) {
+                let ruby_thread: VALUE = rb_ary_entry(threads, i);
+                target_ruby_threads.push(ruby_thread);
+            }
+        }
+
+        self.interval = Some(Arc::new(interval));
+        self.ruby_threads = Arc::new(RwLock::new(target_ruby_threads.into_iter().collect()));
+
+        Qnil.into()
+    }
+
+    fn start(&mut self, _rbself: VALUE) -> VALUE {
         // Create Profile
         let profile = Arc::new(RwLock::new(Profile::new()));
         self.start_profile_buffer_flusher_thread(&profile);
 
         // Start monitoring thread
         let stop_requested = Arc::clone(&self.stop_requested);
+        let interval = Arc::clone(self.interval.as_ref().unwrap());
         let postponed_job_args: Box<PostponedJobArgs> = Box::new(PostponedJobArgs {
             ruby_threads: Arc::clone(&self.ruby_threads),
             profile: Arc::clone(&profile),
@@ -63,7 +127,9 @@ impl TimerThreadScheduler {
                 Box::into_raw(postponed_job_args) as *mut c_void, // FIXME: leak
             )
         };
-        thread::spawn(move || Self::thread_main_loop(stop_requested, postponed_job_handle));
+        thread::spawn(move || {
+            Self::thread_main_loop(stop_requested, interval, postponed_job_handle)
+        });
 
         self.profile = Some(profile);
 
@@ -72,6 +138,7 @@ impl TimerThreadScheduler {
 
     fn thread_main_loop(
         stop_requested: Arc<AtomicBool>,
+        interval: Arc<Duration>,
         postponed_job_handle: rb_postponed_job_handle_t,
     ) {
         loop {
@@ -81,8 +148,8 @@ impl TimerThreadScheduler {
             unsafe {
                 rb_postponed_job_trigger(postponed_job_handle);
             }
-            // sleep for 50 ms
-            thread::sleep(Duration::from_millis(50));
+
+            thread::sleep(*interval);
         }
     }
 
@@ -136,7 +203,7 @@ impl TimerThreadScheduler {
                 continue;
             }
 
-            let sample = Sample::capture(*ruby_thread);
+            let sample = Sample::capture(*ruby_thread, &profile.backtrace_state);
             if profile.temporary_sample_buffer.push(sample).is_err() {
                 log::debug!("Temporary sample buffer full. Dropping sample.");
             }
@@ -164,10 +231,19 @@ impl TimerThreadScheduler {
 
     // Ruby Methods
 
+    pub unsafe extern "C" fn rb_initialize(
+        argc: c_int,
+        argv: *const VALUE,
+        rbself: VALUE,
+    ) -> VALUE {
+        let mut collector = Self::get_struct_from(rbself);
+        collector.initialize(argc, argv, rbself)
+    }
+
     // SampleCollector.start
-    pub unsafe extern "C" fn rb_start(rbself: VALUE, ruby_threads: VALUE, _: VALUE) -> VALUE {
+    pub unsafe extern "C" fn rb_start(rbself: VALUE) -> VALUE {
         let mut collector = Self::get_struct_from(rbself);
-        collector.start(rbself, ruby_threads)
+        collector.start(rbself)
     }
 
     // SampleCollector.stop

data/ext/pf2/src/util.rs

@@ -13,10 +13,10 @@ pub(crate) use cstr;
 pub type RubyCFunc = unsafe extern "C" fn() -> VALUE;
 
 // TODO: rewrite as macro
-pub fn to_ruby_cfunc1<T>(f: unsafe extern "C" fn(T) -> VALUE) -> RubyCFunc {
+pub fn to_ruby_cfunc_with_no_args<T>(f: unsafe extern "C" fn(T) -> VALUE) -> RubyCFunc {
     unsafe { transmute::<unsafe extern "C" fn(T) -> VALUE, RubyCFunc>(f) }
 }
-pub fn to_ruby_cfunc3<T, U, V>(f: unsafe extern "C" fn(T, U, V) -> VALUE) -> RubyCFunc {
+pub fn to_ruby_cfunc_with_args<T, U, V>(f: unsafe extern "C" fn(T, U, V) -> VALUE) -> RubyCFunc {
     unsafe { transmute::<unsafe extern "C" fn(T, U, V) -> VALUE, RubyCFunc>(f) }
 }
 

data/lib/pf2/reporter.rb

@@ -34,6 +34,11 @@ module Pf2
               color: "red",
               subcategories: ["Code"],
             },
+            {
+              name: "Native",
+              color: "blue",
+              subcategories: ["Code"],
+            },
             {
               name: "Native",
               color: "lightblue",
@@ -68,7 +73,7 @@ module Pf2
       def emit
         func_table = build_func_table
         frame_table = build_frame_table
-        stack_table = build_stack_table
+        stack_table = build_stack_table(func_table, frame_table)
         samples = build_samples
 
         string_table = build_string_table
@@ -173,8 +178,10 @@ module Pf2
         }
 
         @thread[:frames].each.with_index do |(id, frame), i|
-          ret[:name] << string_id(frame[:full_label])
-          ret[:is_js] << false
+          native = (frame[:entry_type] == 'Native')
+          label = "#{native ? "Native: " : ""}#{frame[:full_label]}"
+          ret[:name] << string_id(label)
+          ret[:is_js] << !native
           ret[:relevant_for_js] << false
           ret[:resource] << -1
           ret[:file_name] << nil
@@ -188,7 +195,7 @@ module Pf2
         ret
       end
 
-      def build_stack_table
+      def build_stack_table(func_table, frame_table)
         ret = {
           frame: [],
           category: [],
@@ -205,7 +212,7 @@ module Pf2
 
           prefix, node = queue.shift
           ret[:frame] << @frame_id_map[node[:frame_id]]
-          ret[:category] << 1
+          ret[:category] << (build_string_table[func_table[:name][frame_table[:func][@frame_id_map[node[:frame_id]]]]].start_with?('Native:') ? 2 : 1)
           ret[:subcategory] << nil
           ret[:prefix] << prefix
 

data/lib/pf2/version.rb

@@ -1,3 +1,3 @@
 module Pf2
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/pf2.rb

@@ -13,16 +13,13 @@ module Pf2
     end
   end
 
-  def self.default_scheduler
-    @@default_scheduler ||= default_scheduler_class.new
-  end
-
   def self.start(...)
-    default_scheduler.start(...)
+    @@default_scheduler = default_scheduler_class.new(...)
+    @@default_scheduler.start
   end
 
   def self.stop(...)
-    default_scheduler.stop(...)
+    @@default_scheduler.stop(...)
   end
 
   def self.profile(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pf2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daisuke Aritomo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.63
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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'
 description:
 email:
 - osyoyu@osyoyu.com
@@ -53,10 +67,90 @@ files:
 - 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/libtool.m4
+- crates/backtrace-sys2/src/libbacktrace/ltmain.sh
+- crates/backtrace-sys2/src/libbacktrace/ltoptions.m4
+- crates/backtrace-sys2/src/libbacktrace/ltsugar.m4
+- crates/backtrace-sys2/src/libbacktrace/ltversion.m4
+- crates/backtrace-sys2/src/libbacktrace/lt~obsolete.m4
+- 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
 - exe/pf2
 - ext/pf2/Cargo.toml
 - ext/pf2/build.rs
 - 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