perftools.rb 0.1.6 → 0.1.8

data/README

@@ -139,6 +139,12 @@ google-perftools for ruby code
 
 === Resources
 
+  GoRuCo 2009 Lightning Talk on perftools.rb
+    http://goruco2009.confreaks.com/30-may-2009-18-35-rejectconf-various-presenters.html at 21:52
+
+  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/
 

data/ext/extconf.rb

@@ -1,8 +1,13 @@
 require 'mkmf'
+
+if have_func('rb_thread_blocking_region')
+  raise 'Ruby 1.9 is not supported yet'
+end
+
 require 'fileutils'
 require 'net/http'
 
-url = 'http://google-perftools.googlecode.com/files/google-perftools-1.2.tar.gz'
+url = 'http://google-perftools.googlecode.com/files/google-perftools-1.3.tar.gz'
 perftools = File.basename(url)
 dir = File.basename(perftools, '.tar.gz')
 
@@ -10,9 +15,15 @@ Logging.message "(I'm about to download and compile google-perftools.. this will
 
 FileUtils.mkdir_p('src')
 
+if proxy = URI(ENV['http_proxy'] || ENV['HTTP_PROXY']) rescue nil
+  proxy_host = proxy.host
+  proxy_port = proxy.port
+  proxy_user, proxy_pass = proxy.userinfo.split(/:/) if proxy.userinfo
+end
+
 Dir.chdir('src') do
   unless File.exists?(perftools)
-    Net::HTTP.get_response(URI(url)) do |res|
+    Net::HTTP::Proxy(proxy_host, proxy_port, proxy_user, proxy_pass).get_response(URI(url)) do |res|
       File.open(perftools, 'wb') do |out|
         res.read_body do |chunk|
           out.write(chunk)
@@ -25,7 +36,6 @@ Dir.chdir('src') do
     xsystem("tar zxvf #{perftools}")
     Dir.chdir(dir) do
       xsystem("patch -p1 < ../../../patches/perftools.patch")
-      xsystem("patch -p1 < ../../../patches/perftools-static.patch")
       xsystem("patch -p1 < ../../../patches/perftools-osx.patch") if RUBY_PLATFORM =~ /darwin/
       xsystem("patch -p1 < ../../../patches/perftools-debug.patch")# if ENV['DEBUG']
     end
@@ -37,11 +47,11 @@ Dir.chdir('src') do
     end
   end
 
-  unless File.exists?('../libprofiler.a')
+  unless File.exists?('../librubyprofiler.a')
     Dir.chdir(dir) do
       xsystem("./configure --disable-heap-profiler --disable-heap-checker --disable-shared")
       xsystem("make")
-      FileUtils.cp '.libs/libprofiler.a', '../../'
+      FileUtils.cp '.libs/libprofiler.a', '../../librubyprofiler.a'
     end
   end
 end
@@ -51,6 +61,6 @@ when /darwin/, /linux/
   CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
 end
 
-$libs = append_library($libs, 'profiler')
+$libs = append_library($libs, 'rubyprofiler')
 have_func('rb_during_gc', 'ruby.h')
-create_makefile 'perftools'
+create_makefile 'perftools'

data/patches/perftools-debug.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index 1247b91..45179f3 100644
+index a7a4fb5..bfa0347 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -989,13 +989,13 @@ AUTOMAKE = @AUTOMAKE@
+@@ -1067,13 +1067,13 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@

data/patches/perftools-osx.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index 1247b91..3f6e133 100644
+index e3690b2..a7a4fb5 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1017,7 +1017,7 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -1097,7 +1097,7 @@ INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

data/patches/perftools.patch

@@ -1,5 +1,25 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8ba85fb..e3690b2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1067,13 +1067,13 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DBUILD_FOR_RUBY -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -DBUILD_FOR_RUBY -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
 diff --git a/src/pprof b/src/pprof
-index f23786d..21ccd12 100755
+index 9d4d0e8..a41fcb1 100755
 --- a/src/pprof
 +++ b/src/pprof
 @@ -504,7 +504,8 @@ sub Main() {
@@ -12,8 +32,8 @@ index f23786d..21ccd12 100755
    my $profile = $data->{profile};
    my $pcs = $data->{pcs};
    my $libs = $data->{libs};   # Info about main program and shared libraries
-@@ -536,6 +537,17 @@ sub Main() {
-     $symbols = ExtractSymbols($libs, $pcs);
+@@ -549,6 +550,17 @@ sub Main() {
+     $profile = IgnoreProfile($symbols, $profile, $main::opt_ignore);
    }
  
 +  if (-e "$fname.symbols") {
@@ -29,12 +49,12 @@ index f23786d..21ccd12 100755
 +
    my $calls = ExtractCalls($symbols, $profile);
  
-   # Remove uniniteresting stack items
+   # Reduce profiles to required output granularity, and also clean
 diff --git a/src/profile-handler.cc b/src/profile-handler.cc
-index 0a9f54c..5b99a81 100644
+index e658d30..370d012 100644
 --- a/src/profile-handler.cc
 +++ b/src/profile-handler.cc
-@@ -263,6 +263,11 @@ ProfileHandler::~ProfileHandler() {
+@@ -264,6 +264,11 @@ ProfileHandler::~ProfileHandler() {
  void ProfileHandler::RegisterThread() {
    SpinLockHolder cl(&control_lock_);
  
@@ -46,7 +66,7 @@ index 0a9f54c..5b99a81 100644
    // We try to detect whether timers are being shared by setting a
    // timer in the first call to this function, then checking whether
    // it's set in the second call.
-@@ -304,6 +309,7 @@ void ProfileHandler::RegisterThread() {
+@@ -305,6 +310,7 @@ void ProfileHandler::RegisterThread() {
        StartTimer();
        break;
    }
@@ -246,7 +266,7 @@ index c51c7b2..21c7669 100644
  }
  
 diff --git a/src/stacktrace.cc b/src/stacktrace.cc
-index d158eea..e4132fe 100644
+index d158eea..e8509fe 100644
 --- a/src/stacktrace.cc
 +++ b/src/stacktrace.cc
 @@ -52,6 +52,7 @@
@@ -254,7 +274,7 @@ index d158eea..e4132fe 100644
  // Some code may do that.
  
 +#ifndef BUILD_FOR_RUBY
- #include "config.h"
+ #include <config.h>
  #include <google/stacktrace.h>
  #include "stacktrace_config.h"
 @@ -69,3 +70,4 @@
@@ -262,29 +282,8 @@ index d158eea..e4132fe 100644
  # error Cannot calculate stack trace: will need to write for your environment
  #endif
 +#endif
-
-diff --git a/Makefile.in b/Makefile.in
-index 1247b91..45179f3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -989,13 +989,13 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DBUILD_FOR_RUBY -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ -DBUILD_FOR_RUBY -fPIC
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
 diff --git a/src/stacktrace_with_context.cc b/src/stacktrace_with_context.cc
-index f9fc28f..beb7562 100644
+index 02f837d..ca5da92 100644
 --- a/src/stacktrace_with_context.cc
 +++ b/src/stacktrace_with_context.cc
 @@ -41,6 +41,7 @@
@@ -292,7 +291,7 @@ index f9fc28f..beb7562 100644
  // ATTRIBUTE_NOINLINE.
  
 +#ifndef BUILD_FOR_RUBY
- #include "config.h"
+ #include <config.h>
  #include <google/stacktrace.h>
  #include "stacktrace_config.h"
 @@ -59,3 +60,4 @@ int GetStackTraceWithContext(void** result, int max_depth,

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.1.6'
-  s.date = '2009-06-02'
+  s.version = '0.1.8'
+  s.date = '2009-06-15'
   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'
@@ -24,7 +24,6 @@ spec = Gem::Specification.new do |s|
     "ext/perftools.c",
     "patches/perftools-debug.patch",
     "patches/perftools-osx.patch",
-    "patches/perftools-static.patch",
     "patches/perftools.patch",
     "perftools.rb.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -04:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ files:
 - ext/perftools.c
 - patches/perftools-debug.patch
 - patches/perftools-osx.patch
-- patches/perftools-static.patch
 - patches/perftools.patch
 - perftools.rb.gemspec
 has_rdoc: true

data/patches/perftools-static.patch

@@ -1,27 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1247b91..e7c5bca 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3736,14 +3736,14 @@ uninstall-man: uninstall-man1
- # (since it does work only in global constructors and destructors).
- # We just replace the .a with an 'ld-r-ized' version under libtool's
- # nose.
--@WITH_CPU_PROFILER_TRUE@libprofiler.o: libprofiler.la $(libprofiler_la_OBJECTS) $(libprofiler_la_DEPENDENCIES) $(libprofiler_la_LIBADD)
--@WITH_CPU_PROFILER_TRUE@	$(CXXLINK) $(libprofiler_la_OBJECTS) $(libprofiler_la_LIBADD)
--@WITH_CPU_PROFILER_TRUE@	cp -f "$@" .libs/libprofiler.a
--@WITH_CPU_PROFILER_TRUE@profiler_unittest.sh$(EXEEXT): $(top_srcdir)/$(profiler_unittest_sh_SOURCES) \
--@WITH_CPU_PROFILER_TRUE@                               profiler1_unittest profiler2_unittest \
--@WITH_CPU_PROFILER_TRUE@                               profiler3_unittest profiler4_unittest
--@WITH_CPU_PROFILER_TRUE@	rm -f $@
--@WITH_CPU_PROFILER_TRUE@	cp -p $(top_srcdir)/$(profiler_unittest_sh_SOURCES) $@
-+# @WITH_CPU_PROFILER_TRUE@libprofiler.o: libprofiler.la $(libprofiler_la_OBJECTS) $(libprofiler_la_DEPENDENCIES) $(libprofiler_la_LIBADD)
-+# @WITH_CPU_PROFILER_TRUE@	$(CXXLINK) $(libprofiler_la_OBJECTS) $(libprofiler_la_LIBADD)
-+# @WITH_CPU_PROFILER_TRUE@	cp -f "$@" .libs/libprofiler.a
-+# @WITH_CPU_PROFILER_TRUE@profiler_unittest.sh$(EXEEXT): $(top_srcdir)/$(profiler_unittest_sh_SOURCES) \
-+# @WITH_CPU_PROFILER_TRUE@                               profiler1_unittest profiler2_unittest \
-+# @WITH_CPU_PROFILER_TRUE@                               profiler3_unittest profiler4_unittest
-+# @WITH_CPU_PROFILER_TRUE@	rm -f $@
-+# @WITH_CPU_PROFILER_TRUE@	cp -p $(top_srcdir)/$(profiler_unittest_sh_SOURCES) $@
- 
- rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
- 	@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}