pf2 0.4.0 → 0.5.1

data/lib/pf2/session.rb

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

data/lib/pf2/version.rb

@@ -1,3 +1,3 @@
 module Pf2
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

data/lib/pf2.rb

@@ -1,31 +1,24 @@
 require_relative 'pf2/pf2'
+require_relative 'pf2/session'
 require_relative 'pf2/version'
 
 module Pf2
   class Error < StandardError; end
 
-  def self.default_scheduler_class
-    # SignalScheduler is Linux-only. Use TimerThreadScheduler on other platforms.
-    if defined?(SignalScheduler)
-      SignalScheduler
-    else
-      TimerThreadScheduler
-    end
-  end
-
   def self.start(...)
-    @@default_scheduler = default_scheduler_class.new(...)
-    @@default_scheduler.start
+    @@session = Pf2::Session.new(...)
+    @@session.start
   end
 
-  def self.stop(...)
-    @@default_scheduler.stop(...)
+  def self.stop
+    @@session.stop
   end
 
   def self.profile(&block)
     raise ArgumentError, "block required" unless block_given?
-    start([Thread.current], true)
+    start(threads: Thread.list)
     yield
     stop
+    @@session = nil # let GC clean up the session
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pf2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Daisuke Aritomo
 bindir: exe
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.63
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -156,15 +170,21 @@ files:
 - 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/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/configuration.rs
-- ext/pf2/src/signal_scheduler/timer_installer.rs
+- ext/pf2/src/signal_scheduler_unsupported_platform.rs
 - ext/pf2/src/timer_thread_scheduler.rs
 - ext/pf2/src/util.rs
 - lib/pf2.rb
 - lib/pf2/cli.rb
 - lib/pf2/reporter.rb
+- lib/pf2/serve.rb
+- lib/pf2/session.rb
 - lib/pf2/version.rb
 homepage: https://github.com/osyoyu/pf2
 licenses:

data/ext/pf2/src/signal_scheduler/configuration.rs

@@ -1,31 +0,0 @@
-use std::collections::HashSet;
-use std::str::FromStr;
-use std::time::Duration;
-
-use rb_sys::VALUE;
-
-#[derive(Clone, Debug)]
-pub struct Configuration {
-    pub interval: Duration,
-    pub time_mode: TimeMode,
-    pub target_ruby_threads: HashSet<VALUE>,
-    pub track_all_threads: bool,
-}
-
-#[derive(Clone, Debug)]
-pub enum TimeMode {
-    CpuTime,
-    WallTime,
-}
-
-impl FromStr for TimeMode {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "cpu" => Ok(Self::CpuTime),
-            "wall" => Ok(Self::WallTime),
-            _ => Err(()),
-        }
-    }
-}

data/ext/pf2/src/signal_scheduler/timer_installer.rs

@@ -1,145 +0,0 @@
-use std::collections::HashSet;
-use std::ffi::c_void;
-use std::mem;
-use std::mem::ManuallyDrop;
-use std::ptr::null_mut;
-use std::sync::Arc;
-use std::sync::{Mutex, RwLock};
-
-use rb_sys::*;
-
-use super::configuration::Configuration;
-use crate::profile::Profile;
-use crate::ruby_internal_apis::rb_thread_getcpuclockid;
-use crate::signal_scheduler::{cstr, SignalHandlerArgs};
-
-#[derive(Debug)]
-pub struct TimerInstaller {
-    inner: Box<Mutex<Inner>>,
-}
-
-#[derive(Debug)]
-struct Inner {
-    configuration: Configuration,
-    pub profile: Arc<RwLock<Profile>>,
-    known_threads: HashSet<VALUE>,
-}
-
-impl TimerInstaller {
-    // Register a callback that gets called when a Ruby Thread is resumed.
-    // The callback should create a timer for the thread.
-    pub fn install_timer_to_ruby_threads(
-        configuration: Configuration,
-        profile: Arc<RwLock<Profile>>,
-    ) {
-        let installer = Self {
-            inner: Box::new(Mutex::new(Inner {
-                configuration: configuration.clone(),
-                profile,
-                known_threads: HashSet::new(),
-            })),
-        };
-
-        if let Ok(mut inner) = installer.inner.try_lock() {
-            for ruby_thread in configuration.target_ruby_threads.iter() {
-                let ruby_thread: VALUE = *ruby_thread;
-                inner.known_threads.insert(ruby_thread);
-                inner.register_timer_to_ruby_thread(ruby_thread);
-            }
-        }
-
-        if configuration.track_all_threads {
-            let ptr = Box::into_raw(installer.inner);
-            unsafe {
-                // TODO: Clean up this hook when the profiling session ends
-                rb_internal_thread_add_event_hook(
-                    Some(Self::on_thread_resume),
-                    RUBY_INTERNAL_THREAD_EVENT_RESUMED,
-                    ptr as *mut c_void,
-                );
-            };
-        }
-    }
-
-    // Thread start callback
-    unsafe extern "C" fn on_thread_resume(
-        _flag: rb_event_flag_t,
-        data: *const rb_internal_thread_event_data,
-        custom_data: *mut c_void,
-    ) {
-        let ruby_thread: VALUE = unsafe { (*data).thread };
-
-        // A pointer to Box<Inner> is passed as custom_data
-        let inner = unsafe { ManuallyDrop::new(Box::from_raw(custom_data as *mut Mutex<Inner>)) };
-        let mut inner = inner.lock().unwrap();
-
-        if !inner.known_threads.contains(&ruby_thread) {
-            inner.known_threads.insert(ruby_thread);
-            // Install a timer for the thread
-            inner.register_timer_to_ruby_thread(ruby_thread);
-        }
-    }
-}
-
-impl Inner {
-    fn register_timer_to_ruby_thread(&self, ruby_thread: VALUE) {
-        // NOTE: This Box is never dropped
-        let signal_handler_args = Box::new(SignalHandlerArgs {
-            profile: Arc::clone(&self.profile),
-            context_ruby_thread: ruby_thread,
-        });
-
-        // rb_funcall deadlocks when called within a THREAD_EVENT_STARTED hook
-        let kernel_thread_id: i32 = i32::try_from(unsafe {
-            rb_num2int(rb_funcall(
-                ruby_thread,
-                rb_intern(cstr!("native_thread_id")), // kernel thread ID
-                0,
-            ))
-        })
-        .unwrap();
-
-        // Create a signal event
-        let mut sigevent: libc::sigevent = unsafe { mem::zeroed() };
-        // Note: SIGEV_THREAD_ID is Linux-specific. In other platforms, we would need to
-        // "trampoline" the signal as any pthread can receive the signal.
-        sigevent.sigev_notify = libc::SIGEV_THREAD_ID;
-        sigevent.sigev_notify_thread_id = kernel_thread_id;
-        sigevent.sigev_signo = libc::SIGALRM;
-        // Pass required args to the signal handler
-        sigevent.sigev_value.sival_ptr = Box::into_raw(signal_handler_args) as *mut c_void;
-
-        // Create and configure timer to fire every _interval_ ms of CPU time
-        let mut timer: libc::timer_t = unsafe { mem::zeroed() };
-        let clockid = match self.configuration.time_mode {
-            crate::signal_scheduler::TimeMode::CpuTime => unsafe {
-                rb_thread_getcpuclockid(ruby_thread)
-            },
-            crate::signal_scheduler::TimeMode::WallTime => libc::CLOCK_MONOTONIC,
-        };
-        let err = unsafe { libc::timer_create(clockid, &mut sigevent, &mut timer) };
-        if err != 0 {
-            panic!("timer_create failed: {}", err);
-        }
-        let itimerspec = Self::duration_to_itimerspec(&self.configuration.interval);
-        let err = unsafe { libc::timer_settime(timer, 0, &itimerspec, null_mut()) };
-        if err != 0 {
-            panic!("timer_settime failed: {}", err);
-        }
-
-        log::debug!("timer registered for thread {}", ruby_thread);
-    }
-
-    fn duration_to_itimerspec(duration: &std::time::Duration) -> libc::itimerspec {
-        let nanos = duration.as_nanos();
-        let seconds_part: i64 = (nanos / 1_000_000_000).try_into().unwrap();
-        let nanos_part: i64 = (nanos % 1_000_000_000).try_into().unwrap();
-
-        let mut its: libc::itimerspec = unsafe { mem::zeroed() };
-        its.it_interval.tv_sec = seconds_part;
-        its.it_interval.tv_nsec = nanos_part;
-        its.it_value.tv_sec = seconds_part;
-        its.it_value.tv_nsec = nanos_part;
-        its
-    }
-}