perftools.rb 0.5.0 → 0.5.1

data/README

@@ -33,6 +33,10 @@ google-perftools for ruby code
 
     $ CPUPROFILE_OBJECTS=1 ruby my_app.rb
 
+  Profile method calls:
+
+    $ CPUPROFILE_METHODS=1 ruby my_app.rb
+
 
 === Reporting
 

data/ext/extconf.rb

@@ -27,6 +27,7 @@ perftools = File.basename('google-perftools-1.4.tar.gz')
 dir = File.basename(perftools, '.tar.gz')
 
 puts "(I'm about to compile google-perftools.. this will definitely take a while)"
+ENV["PATCH_GET"] = '0'
 
 Dir.chdir('src') do
   FileUtils.rm_rf(dir) if File.exists?(dir)

data/ext/perftools.c

@@ -213,6 +213,8 @@ static VALUE Isend;
 
 static VALUE objprofiler_setup();
 static VALUE objprofiler_teardown();
+static VALUE methprofiler_setup();
+static VALUE methprofiler_teardown();
 
 /* CpuProfiler */
 
@@ -236,6 +238,7 @@ cpuprofiler_stop(VALUE self)
 
   bProfilerRunning = Qfalse;
   objprofiler_teardown();
+  methprofiler_teardown();
   ProfilerStop();
   ProfilerFlush();
 
@@ -252,6 +255,8 @@ cpuprofiler_start(VALUE self, VALUE filename)
 
   if (getenv("CPUPROFILE_OBJECTS"))
     objprofiler_setup();
+  else if (getenv("CPUPROFILE_METHODS"))
+    methprofiler_setup();
 
   if (ProfilerStart(RSTRING_PTR(filename))) {
     bProfilerRunning = Qtrue;
@@ -285,6 +290,7 @@ cpuprofiler_gc_mark()
 #include <sys/mman.h>
 
 static VALUE bObjProfilerRunning;
+static VALUE bMethProfilerRunning;
 #define NUM_ORIG_BYTES 2
 
 struct {
@@ -332,6 +338,35 @@ uc_get_ip(ucontext_t *uc) {
   return (char**)&uc->program_counter;
 }
 
+static void
+event_handler(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass) {
+  ProfilerRecord(0, NULL, NULL);
+}
+
+static VALUE
+methprofiler_setup()
+{
+  if (bMethProfilerRunning)
+    return Qtrue;
+
+  rb_add_event_hook(event_handler, RUBY_EVENT_CALL);
+
+  bMethProfilerRunning = Qtrue;
+  return Qtrue;
+}
+
+static VALUE
+methprofiler_teardown()
+{
+  if (!bMethProfilerRunning)
+    return Qfalse;
+
+  rb_remove_event_hook(event_handler);
+
+  bMethProfilerRunning = Qfalse;
+  return Qtrue;
+}
+
 static void
 trap_handler(int sig, siginfo_t *info, void *data) {
   int i;
@@ -423,7 +458,7 @@ Init_perftools()
   I__send__ = rb_intern("__send__");
   Isend = rb_intern("send");
 
-  bObjProfilerRunning = bProfilerRunning = Qfalse;
+  bMethProfilerRunning = bObjProfilerRunning = bProfilerRunning = Qfalse;
 
   rb_define_singleton_method(cCpuProfiler, "running?", cpuprofiler_running_p, 0);
   rb_define_singleton_method(cCpuProfiler, "start", cpuprofiler_start, 1);
@@ -437,6 +472,8 @@ Init_perftools()
 
     if (getenv("CPUPROFILE_OBJECTS")) {    // want to profile objects
       objprofiler_setup();
+    } else if (getenv("CPUPROFILE_METHODS")) {
+      methprofiler_setup();
     }
 
     rb_set_end_proc(profiler_at_exit, 0);  // make sure to cleanup before the VM shuts down

data/patches/perftools-objects.patch

@@ -12,7 +12,7 @@ index 619b980..2ecf2c0 100644
  }
  
  void ProfileHandler::StartTimer() {
-+  if (getenv("CPUPROFILE_OBJECTS")) return;
++  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct itimerval timer;
    timer.it_interval.tv_sec = 0;
@@ -21,7 +21,7 @@ index 619b980..2ecf2c0 100644
  }
  
  void ProfileHandler::StopTimer() {
-+  if (getenv("CPUPROFILE_OBJECTS")) return;
++  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct itimerval timer;
    memset(&timer, 0, sizeof timer);
@@ -29,7 +29,7 @@ index 619b980..2ecf2c0 100644
  }
  
  bool ProfileHandler::IsTimerRunning() {
-+  if (getenv("CPUPROFILE_OBJECTS")) return false;
++  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return false;
 +
    struct itimerval current_timer;
    RAW_CHECK(0 == getitimer(realtime_ ? ITIMER_REAL : ITIMER_PROF, &current_timer), "getitimer");
@@ -38,7 +38,7 @@ index 619b980..2ecf2c0 100644
  }
  
  void ProfileHandler::EnableHandler() {
-+  if (getenv("CPUPROFILE_OBJECTS")) return;
++  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct sigaction sa;
    sa.sa_sigaction = SignalHandler;
@@ -47,7 +47,7 @@ index 619b980..2ecf2c0 100644
  }
  
  void ProfileHandler::DisableHandler() {
-+  if (getenv("CPUPROFILE_OBJECTS")) return;
++  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct sigaction sa;
    sa.sa_handler = SIG_IGN;

data/patches/perftools-pprof.patch

@@ -30,13 +30,14 @@ index b5ef29a..25b956d 100755
    # Remove uniniteresting stack items
    $profile = RemoveUninterestingFrames($symbols, $profile);
  
-@@ -1927,6 +1927,9 @@ sub RemoveUninterestingFrames {
+@@ -1927,6 +1927,10 @@ sub RemoveUninterestingFrames {
  		      'ProfileData::prof_handler',  # historical
  		      'CpuProfiler::prof_handler',
                        '__FRAME_END__',
 +		      'PerfTools::CpuProfiler.start',
 +		      'Array#each',
 +		      'Proc#call',
++		      'Class#new',
  		      '__pthread_sighandler',
  		      '__restore') {
        $skip{$name} = 1;

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.5.0'
-  s.date = '2010-08-19'
+  s.version = '0.5.1'
+  s.date = '2010-11-12'
   s.rubyforge_project = 'perftools-rb'
   s.summary = 'google-perftools for ruby code'
   s.description = 'A sampling profiler for ruby code based on patches to google-perftools'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -07:00
+date: 2010-11-12 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -55,27 +54,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: google-perftools for ruby code