perftools.rb 0.5.6 → 2.0.0

data/README.md

@@ -1,9 +1,11 @@
 # perftools.rb
 
-    google-perftools for ruby code
-    (c) 2010 Aman Gupta (tmm1)
+    gperftools for ruby code
+    (c) 2012 Aman Gupta (tmm1)
     http://www.ruby-lang.org/en/LICENSE.txt
 
+    gperftools (formerly known as google-perftools): http://gperftools.googlecode.com
+
 ## Usage (in a webapp)
 
   Use [rack-perftools_profiler](https://github.com/bhb/rack-perftools_profiler):
@@ -81,7 +83,7 @@ The sampling interval of the profiler can be adjusted to collect more
     pprof.rb --text --ignore=Gem /tmp/my_app_profile
 
 
-  For more options, see [pprof documentation](http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html#pprof)
+  For more options, see [pprof documentation](http://gperftools.googlecode.com/svn/trunk/doc/cpuprofile.html#pprof)
 
 
 ### Examples
@@ -108,7 +110,7 @@ The sampling interval of the profiler can be adjusted to collect more
 
 ## Installation
 
-  Just install the gem, which will download, patch and compile google-perftools for you:
+  Just install the gem, which will download, patch and compile gperftools for you:
 
     sudo gem install perftools.rb
 
@@ -119,12 +121,17 @@ The sampling interval of the profiler can be adjusted to collect more
     gem build perftools.rb.gemspec
     gem install perftools.rb
 
+  Use via a Gemfile:
+
+    gem 'perftools.rb', :git => 'git://github.com/tmm1/perftools.rb.git'
 
   You'll also need graphviz to generate call graphs using dot:
 
     sudo brew    install graphviz ghostscript # osx
     sudo apt-get install graphviz ps2pdf      # debian/ubuntu
 
+  If graphviz fails to build on OSX Lion, you may need to recompile libgd, [see here](https://github.com/mxcl/homebrew/issues/6645#issuecomment-1806807)
+
 ## Advantages over ruby-prof
 
 * Sampling profiler
@@ -138,9 +145,9 @@ The sampling interval of the profiler can be adjusted to collect more
 
   Download:
 
-    wget http://google-perftools.googlecode.com/files/google-perftools-1.6.tar.gz
-    tar zxvf google-perftools-1.6.tar.gz
-    cd google-perftools-1.6
+    wget http://gperftools.googlecode.com/files/gperftools-2.0.tar.gz
+    tar zxvf gperftools-2.0.tar.gz
+    cd gperftools-2.0
 
   Compile:
 
@@ -172,6 +179,6 @@ The sampling interval of the profiler can be adjusted to collect more
 
   * [Ilya Grigorik's introduction to perftools.rb](http://www.igvita.com/2009/06/13/profiling-ruby-with-googles-perftools/)
 
-  * [Google Perftools](http://code.google.com/p/google-perftools/)
+  * [Google Perftools](http://code.google.com/p/gperftools/)
 
-  * [Analyzing profiles and interpreting different output formats](http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html#pprof)
+  * [Analyzing profiles and interpreting different output formats](http://gperftools.googlecode.com/svn/trunk/doc/cpuprofile.html#pprof)

data/bin/pprof.rb

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
 require 'rbconfig'
-cmd = "#{File.dirname(__FILE__)}/pprof #{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']} #{ARGV.join(" ")}"
-exec(cmd)
+exec(File.join(File.dirname(__FILE__), 'pprof'), File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']), *ARGV)

data/ext/extconf.rb

@@ -3,7 +3,7 @@ CWD = File.expand_path(File.dirname(__FILE__))
 def sys(cmd)
   puts "  -- #{cmd}"
   unless ret = xsystem(cmd)
-    raise "#{cmd} failed, please report to perftools@tmm1.net with pastie.org link to #{CWD}/mkmf.log and #{CWD}/src/google-perftools-1.6/config.log"
+    raise "#{cmd} failed, please report to https://github.com/tmm1/perfools.rb/issues/new with #{CWD}/src/mkmf.log and #{CWD}/src/gperftools-2.0/config.log"
   end
   ret
 end
@@ -27,7 +27,7 @@ if RUBY_VERSION >= "1.9"
   end
 end
 
-perftools = File.basename('google-perftools-1.6.tar.gz')
+perftools = File.basename('gperftools-2.0.tar.gz')
 dir = File.basename(perftools, '.tar.gz')
 
 puts "(I'm about to compile google-perftools.. this will definitely take a while)"
@@ -36,7 +36,7 @@ ENV["PATCH_GET"] = '0'
 Dir.chdir('src') do
   FileUtils.rm_rf(dir) if File.exists?(dir)
 
-  sys("tar zxvf #{perftools}")
+  sys("tar zpxvf #{perftools}")
   Dir.chdir(dir) do
     if ENV['DEV']
       sys("git init")
@@ -48,10 +48,11 @@ Dir.chdir('src') do
       ['perftools-notests', true],
       ['perftools-pprof', true],
       ['perftools-gc', true],
-      ['perftools-osx', RUBY_PLATFORM =~ /darwin/],
+      ['perftools-osx', false], # fixed in 2.0
       ['perftools-debug', true],
       ['perftools-objects', true],
-      ['perftools-frames', true]
+      ['perftools-frames', true],
+      ['perftools-realtime', true]
     ].each do |patch, apply|
       if apply
         sys("patch -p1 < ../../../patches/#{patch}.patch")

data/ext/perftools.c

@@ -123,6 +123,11 @@ static VALUE Isend;
   #include <vm_core.h>
   #include <iseq.h>
 
+// Fix compile error in ruby 1.9.3
+#ifdef RTYPEDDATA_DATA
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+#endif
+
   int
   rb_stack_trace(void** result, int max_depth)
   {

data/patches/perftools-notests.patch

@@ -1,15 +1,33 @@
 diff --git a/Makefile.in b/Makefile.in
-index b301f4d..969db5e 100644
+index be6bce7..423baba 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -65,9 +65,7 @@ host_triplet = @host@
- @ENABLE_FRAME_POINTERS_TRUE@@X86_64_AND_NO_FP_BY_DEFAULT_TRUE@am__append_3 = -fno-omit-frame-pointer
- @ENABLE_FRAME_POINTERS_FALSE@@X86_64_AND_NO_FP_BY_DEFAULT_TRUE@am__append_4 = -DNO_FRAME_POINTER
- @MINGW_TRUE@am__append_5 = -Wl,-u__tcmalloc
+@@ -66,26 +66,8 @@ host_triplet = @host@
+ @ENABLE_FRAME_POINTERS_TRUE@@X86_64_AND_NO_FP_BY_DEFAULT_TRUE@am__append_5 = -fno-omit-frame-pointer
+ @ENABLE_FRAME_POINTERS_FALSE@@X86_64_AND_NO_FP_BY_DEFAULT_TRUE@am__append_6 = -DNO_FRAME_POINTER
+ @MINGW_TRUE@am__append_7 = -Wl,-u__tcmalloc
+-TESTS = low_level_alloc_unittest$(EXEEXT) atomicops_unittest$(EXEEXT) \
+-	$(am__EXEEXT_9) tcmalloc_minimal_unittest$(EXEEXT) \
+-	tcmalloc_minimal_large_unittest$(EXEEXT) $(am__append_17) \
+-	addressmap_unittest$(EXEEXT) $(am__EXEEXT_10) \
+-	packed_cache_test$(EXEEXT) frag_unittest$(EXEEXT) \
+-	markidle_unittest$(EXEEXT) \
+-	current_allocated_bytes_test$(EXEEXT) \
+-	malloc_hook_test$(EXEEXT) malloc_extension_test$(EXEEXT) \
+-	$(am__EXEEXT_11) $(am__EXEEXT_12) page_heap_test$(EXEEXT) \
+-	pagemap_unittest$(EXEEXT) realloc_unittest$(EXEEXT) \
+-	stack_trace_table_test$(EXEEXT) \
+-	thread_dealloc_unittest$(EXEEXT) $(am__EXEEXT_13) \
+-	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__append_29) \
+-	$(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \
+-	$(am__EXEEXT_19) $(am__append_49) $(am__EXEEXT_20) \
+-	$(am__append_58) $(am__append_60) $(am__EXEEXT_21) \
+-	$(am__EXEEXT_22)
 -noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 -	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
 -	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_23)
++TESTS =
 +noinst_PROGRAMS =
  bin_PROGRAMS =
- @MINGW_TRUE@am__append_6 = libwindows.la libspinlock.la
+ @MINGW_TRUE@am__append_8 = libwindows.la libspinlock.la
  

data/patches/perftools-objects.patch

@@ -1,53 +1,60 @@
+commit 7a33a39f5b31e41f87a47bcadff818208fcc6c05
+Author: Aman Gupta <aman@tmm1.net>
+Date:   Wed Mar 7 22:55:33 2012 -0800
+
+    perftools-objects
+
 diff --git a/src/profile-handler.cc b/src/profile-handler.cc
-index 5df5054..2335617 100644
+index f9d8d8b..91f6f72 100644
 --- a/src/profile-handler.cc
 +++ b/src/profile-handler.cc
-@@ -395,6 +395,8 @@ void ProfileHandler::GetState(ProfileHandlerState* state) {
- }
- 
- void ProfileHandler::StartTimer() {
+@@ -426,6 +426,8 @@ void ProfileHandler::StartTimer() {
+   if (!allowed_) {
+     return;
+   }
 +  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct itimerval timer;
    timer.it_interval.tv_sec = 0;
    timer.it_interval.tv_usec = 1000000 / frequency_;
-@@ -403,12 +405,16 @@ void ProfileHandler::StartTimer() {
- }
- 
- void ProfileHandler::StopTimer() {
+@@ -437,6 +439,8 @@ void ProfileHandler::StopTimer() {
+   if (!allowed_) {
+     return;
+   }
 +  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct itimerval timer;
    memset(&timer, 0, sizeof timer);
    setitimer(timer_type_, &timer, 0);
- }
- 
- bool ProfileHandler::IsTimerRunning() {
+@@ -446,6 +450,8 @@ bool ProfileHandler::IsTimerRunning() {
+   if (!allowed_) {
+     return false;
+   }
 +  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return false;
 +
    struct itimerval current_timer;
    RAW_CHECK(0 == getitimer(timer_type_, &current_timer), "getitimer");
    return (current_timer.it_value.tv_sec != 0 ||
-@@ -416,6 +422,8 @@ bool ProfileHandler::IsTimerRunning() {
- }
- 
- void ProfileHandler::EnableHandler() {
+@@ -456,6 +462,8 @@ void ProfileHandler::EnableHandler() {
+   if (!allowed_) {
+     return;
+   }
 +  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct sigaction sa;
    sa.sa_sigaction = SignalHandler;
    sa.sa_flags = SA_RESTART | SA_SIGINFO;
-@@ -425,6 +433,8 @@ void ProfileHandler::EnableHandler() {
- }
- 
- void ProfileHandler::DisableHandler() {
+@@ -468,6 +476,8 @@ void ProfileHandler::DisableHandler() {
+   if (!allowed_) {
+     return;
+   }
 +  if (getenv("CPUPROFILE_OBJECTS") || getenv("CPUPROFILE_METHODS")) return;
 +
    struct sigaction sa;
    sa.sa_handler = SIG_IGN;
    sa.sa_flags = SA_RESTART;
 diff --git a/src/profiler.cc b/src/profiler.cc
-index f408cf8..7645c45 100644
+index 6538299..8e92b91 100644
 --- a/src/profiler.cc
 +++ b/src/profiler.cc
 @@ -102,6 +102,10 @@ class CpuProfiler {

data/patches/perftools-realtime.patch

@@ -0,0 +1,22 @@
+commit 2c428e120733fdbf4ae2399046d9d63e6845b18d
+Author: Aman Gupta <aman@tmm1.net>
+Date:   Thu Mar 8 22:39:12 2012 -0800
+
+    perftools-realtime
+
+diff --git a/src/profile-handler.cc b/src/profile-handler.cc
+index dfc8cf4..567ca45 100644
+--- a/src/profile-handler.cc
++++ b/src/profile-handler.cc
+@@ -491,6 +491,11 @@ bool ProfileHandler::IsSignalHandlerAvailable() {
+   const int signal_number = (timer_type_ == ITIMER_PROF ? SIGPROF : SIGALRM);
+   RAW_CHECK(sigaction(signal_number, NULL, &sa) == 0, "is-signal-handler avail");
+ 
++#ifdef BUILD_FOR_RUBY
++  // Inside ruby, there's a default signal handler set for SIGALRM.
++  return true;
++#endif
++
+   // We only take over the handler if the current one is unset.
+   // It must be SIG_IGN or SIG_DFL, not some other function.
+   // SIG_IGN must be allowed because when profiling is allowed but

data/perftools.rb.gemspec

@@ -1,7 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.5.6'
-  s.date = '2011-01-23'
+  s.version = '2.0.0'
   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,13 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: 
   segments: 
+  - 2
   - 0
-  - 5
-  - 6
-  version: 0.5.6
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 -08:00
+date: 2012-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +32,7 @@ files:
 - bin/pprof.rb
 - ext/extconf.rb
 - ext/perftools.c
-- ext/src/google-perftools-1.6.tar.gz
+- ext/src/gperftools-2.0.tar.gz
 - patches/perftools-debug.patch
 - patches/perftools-frames.patch
 - patches/perftools-gc.patch
@@ -40,6 +40,7 @@ files:
 - patches/perftools-objects.patch
 - patches/perftools-osx.patch
 - patches/perftools-pprof.patch
+- patches/perftools-realtime.patch
 - patches/perftools.patch
 - perftools.rb.gemspec
 has_rdoc: false
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: google-perftools for ruby code