perftools.rb 0.2.5 → 0.3.1

data/README

@@ -134,7 +134,6 @@ google-perftools for ruby code
   * Add support for heap profiling to find memory leaks (PerfTools::HeapProfiler)
   * Allow both C and Ruby profiling
   * Add setter for the sampling interval
-  * Add support for ruby 1.9
 
 
 === Resources

data/ext/extconf.rb

@@ -1,67 +1,93 @@
-require 'mkmf'
+CWD = File.expand_path(File.dirname(__FILE__))
 
-if have_func('rb_thread_blocking_region')
-  raise 'Ruby 1.9 is not supported yet'
+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.4/config.log"
+  end
+  ret
 end
 
+require 'mkmf'
 require 'fileutils'
-require 'net/http'
 
-url = 'http://google-perftools.googlecode.com/files/google-perftools-1.3.tar.gz'
-perftools = File.basename(url)
-dir = File.basename(perftools, '.tar.gz')
-
-Logging.message "(I'm about to download and compile google-perftools.. this will definitely take a while)"
+if RUBY_VERSION >= "1.9"
+  begin
+    require "ruby_core_source"
+  rescue LoadError
+    STDERR.puts "\n\n"
+    STDERR.puts "***************************************************************************************"
+    STDERR.puts "******************** PLEASE RUN gem install ruby_core_source FIRST ********************"
+    STDERR.puts "***************************************************************************************"
+    exit(1)
+  end
+end
 
-FileUtils.mkdir_p('src')
+perftools = File.basename('google-perftools-1.4.tar.gz')
+dir = File.basename(perftools, '.tar.gz')
 
-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
+puts "(I'm about to compile google-perftools.. this will definitely take a while)"
 
 Dir.chdir('src') do
-  unless File.exists?(perftools)
-    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)
-        end
-      end
-    end
-  end
+  FileUtils.rm_rf(dir) if File.exists?(dir)
 
-  unless File.exists?(dir)
-    xsystem("tar zxvf #{perftools}")
-    Dir.chdir(dir) do
-      xsystem("patch -p1 < ../../../patches/perftools.patch")
-      xsystem("patch -p1 < ../../../patches/perftools-gc.patch")
-      xsystem("patch -p1 < ../../../patches/perftools-osx.patch") if RUBY_PLATFORM =~ /darwin/
-      xsystem("patch -p1 < ../../../patches/perftools-debug.patch")# if ENV['DEBUG']
-    end
+  sys("tar zxvf #{perftools}")
+  Dir.chdir(dir) do
+    sys("patch -p1 < ../../../patches/perftools.patch")
+    sys("patch -p1 < ../../../patches/perftools-pprof.patch")
+    sys("patch -p1 < ../../../patches/perftools-gc.patch")
+    sys("patch -p1 < ../../../patches/perftools-osx.patch") if RUBY_PLATFORM =~ /darwin/
+    sys("patch -p1 < ../../../patches/perftools-osx-106.patch") if RUBY_PLATFORM =~ /darwin10/
+    sys("patch -p1 < ../../../patches/perftools-debug.patch")
   end
 
-  unless File.exists?('../bin/pprof')
-    Dir.chdir(dir) do
-      FileUtils.cp 'src/pprof', '../../../bin/'
-    end
+  Dir.chdir(dir) do
+    FileUtils.cp 'src/pprof', '../../../bin/'
+    FileUtils.chmod 0755, '../../../bin/pprof'
   end
 
-  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', '../../librubyprofiler.a'
+  Dir.chdir(dir) do
+    if RUBY_PLATFORM =~ /darwin10/
+      ENV['CFLAGS'] = ENV['CXXFLAGS'] = '-D_XOPEN_SOURCE'
     end
+    sys("./configure --disable-heap-profiler --disable-heap-checker --disable-shared")
+    sys("make")
+    FileUtils.cp '.libs/libprofiler.a', '../../librubyprofiler.a'
   end
 end
 
+$LIBPATH << CWD
+$libs = append_library($libs, 'rubyprofiler')
+def add_define(name)
+  $defs.push("-D#{name}")
+end
+
 case RUBY_PLATFORM
 when /darwin/, /linux/
   CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
 end
 
-$libs = append_library($libs, 'rubyprofiler')
-have_func('rb_during_gc', 'ruby.h')
-create_makefile 'perftools'
+if RUBY_VERSION >= "1.9"
+  add_define 'RUBY19'
+
+  hdrs = proc {
+    have_header("vm_core.h") and
+    have_header("iseq.h") and
+    have_header("insns.inc") and
+    have_header("insns_info.inc")
+  }
+  have_func('rb_during_gc', 'ruby.h')
+
+  unless Ruby_core_source::create_makefile_with_core(hdrs, "perftools")
+    STDERR.puts "\n\n"
+    STDERR.puts "***************************************************************************************"
+    STDERR.puts "********************** Ruby_core_source::create_makefile FAILED ***********************"
+    STDERR.puts "***************************************************************************************"
+    exit(1)
+  end
+else
+  add_define 'RUBY18'
+
+  have_func('rb_during_gc', 'ruby.h')
+  create_makefile 'perftools'
+end

data/ext/perftools.c

@@ -1,78 +1,160 @@
 #include <ruby.h>
-#include <node.h>
-#include <env.h>
-
 static VALUE Iallocate;
 static VALUE I__send__;
 
-static inline void
-save_frame(struct FRAME *frame, void** result, int *depth)
-{
-  VALUE klass = frame->last_class;
-  // XXX what is an ICLASS anyway?
-  // if (BUILTIN_TYPE(klass) == T_ICLASS)
-  //   klass = RBASIC(klass)->klass;
-
-  if (frame->last_func == I__send__)
-    return;
-
-  if (FL_TEST(klass, FL_SINGLETON) &&
-      (BUILTIN_TYPE(frame->self) == T_CLASS || BUILTIN_TYPE(frame->self) == T_MODULE))
-    result[(*depth)++] = (void*) frame->self;
-  else
-    result[(*depth)++] = 0;
-
-  result[(*depth)++] = (void*) klass;
-  result[(*depth)++] = (void*) (frame->last_func == ID_ALLOCATOR ? Iallocate : frame->last_func);
-}
+#define SAVE_FRAME() \
+  if (method != I__send__) { \
+    if (FL_TEST(klass, FL_SINGLETON) && (BUILTIN_TYPE(self) == T_CLASS || BUILTIN_TYPE(self) == T_MODULE)) \
+      result[depth++] = (void*) self; \
+    else \
+      result[depth++] = 0; \
+    \
+    result[depth++] = (void*) klass; \
+    result[depth++] = (void*) (method == ID_ALLOCATOR ? Iallocate : method); \
+  }
 
-int
-rb_stack_trace(void** result, int max_depth)
-{
-  int depth = 0;
-  struct FRAME *frame = ruby_frame;
-  NODE *n;
+#ifdef RUBY18
+  #include <node.h>
+  #include <env.h>
+
+  int
+  rb_stack_trace(void** result, int max_depth)
+  {
+    struct FRAME *frame = ruby_frame;
+    NODE *n;
+
+    VALUE klass, self;
+    ID method;
+    int depth = 0;
+
+    if (max_depth == 0)
+      return 0;
 
-  if (max_depth == 0)
-    return 0;
+    #ifdef HAVE_RB_DURING_GC
+    if (rb_during_gc()) {
+      result[0] = rb_gc;
+      return 1;
+    }
+    #endif
+
+    /*
+    // XXX does it make sense to track allocations or not?
+    if (frame->last_func == ID_ALLOCATOR) {
+      frame = frame->prev;
+    }
+
+    // XXX SIGPROF can come in while ruby_frame is in an inconsistent state (rb_call0), so we ignore the top-most frame
+    if (frame->last_func) {
+      self = frame->self;
+      klass = frame->last_class;
+      method = frame->last_func;
+      SAVE_FRAME();
+    }
+    */
+
+    for (; frame && (n = frame->node); frame = frame->prev) {
+      if (frame->prev && frame->prev->last_func) {
+        if (frame->prev->node == n) {
+          if (frame->prev->last_func == frame->last_func) continue;
+        }
 
-  // XXX: figure out what these mean. is there a way to access them from an extension?
-  // if (rb_prohibit_interrupt || !rb_trap_immediate) return 0;
+        if (depth+3 > max_depth)
+          break;
+
+        self = frame->prev->self;
+        klass = frame->prev->last_class;
+        method = frame->prev->last_func;
+        SAVE_FRAME();
+      }
+    }
 
-#ifdef HAVE_RB_DURING_GC
-  if (rb_during_gc()) {
-    result[0] = rb_gc;
-    return 1;
+    return depth;
   }
 #endif
 
-  // XXX SIGPROF can come in while ruby_frame is in an inconsistent state (rb_call0), so we ignore the top-most frame
-  /*
-  // XXX does it make sense to track allocations or not?
-  if (frame->last_func == ID_ALLOCATOR) {
-    frame = frame->prev;
-  }
+#ifdef RUBY19
+  #include <vm_core.h>
+  #include <iseq.h>
 
-  if (frame->last_func) {
-    save_frame(frame, result, &depth);
-  }
-  */
+  int
+  rb_stack_trace(void** result, int max_depth)
+  {
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
+    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+
+    VALUE klass, self;
+    ID method;
+    int depth = 0;
+
+    if (max_depth == 0)
+      return 0;
+
+    #ifdef HAVE_RB_DURING_GC
+    if (rb_during_gc()) {
+      result[0] = rb_gc;
+      return 1;
+    }
+    #endif
+
+    while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp) && depth+3 < max_depth) {
+      rb_iseq_t *iseq = cfp->iseq;
 
-  for (; frame && (n = frame->node); frame = frame->prev) {
-    if (frame->prev && frame->prev->last_func) {
-      if (frame->prev->node == n) {
-        if (frame->prev->last_func == frame->last_func) continue;
+      if (iseq && iseq->type == ISEQ_TYPE_METHOD) {
+        self = iseq->self;
+        klass = iseq->klass;
+        method = iseq->defined_method_id;
+        SAVE_FRAME();
       }
 
-      if (depth+3 > max_depth)
-        break;
+      switch(VM_FRAME_TYPE(cfp)) {
+        case VM_FRAME_MAGIC_METHOD:
+        case VM_FRAME_MAGIC_CFUNC:
+          self = cfp->self;
+          klass = cfp->method_class;
+          method = cfp->method_id;
+          SAVE_FRAME();
+          break;
+      }
 
-      save_frame(frame->prev, result, &depth);
+      cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
+
+    return depth;
   }
 
-  return depth;
-}
+  #if 0
+  void
+  rb_dump_stack()
+  {
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp = th->cfp;
+    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+    ID func;
+
+    printf("\n\n*********************\n");
+    while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
+      printf("cfp (%p):\n", cfp);
+      printf("  type: 0x%x\n", VM_FRAME_TYPE(cfp));
+      printf("  pc: %p\n", cfp->pc);
+      printf("  iseq: %p\n", cfp->iseq);
+      if (cfp->iseq) {
+        printf("     type: %d\n", FIX2INT(cfp->iseq->type));
+        printf("     self: %p\n", cfp->iseq->self);
+        printf("     klass: %p (%s)\n", cfp->iseq->klass, cfp->iseq->klass ? rb_class2name(cfp->iseq->klass) : "");
+        printf("     method: %p (%s)\n", cfp->iseq->defined_method_id, cfp->iseq->defined_method_id ? rb_id2name(cfp->iseq->defined_method_id) : "");
+      }
+      printf("  self: %p\n", cfp->self);
+      printf("  klass: %p (%s)\n", cfp->method_class, cfp->method_class ? rb_class2name(cfp->method_class) : "");
+      printf("  method: %p (%s)\n", cfp->method_id, cfp->method_id ? rb_id2name(cfp->method_id) : "");
+
+      cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+      printf("\n");
+    }
+    printf("*********************\n\n");
+  }
+  #endif
+#endif
 
 static VALUE cPerfTools;
 static VALUE cCpuProfiler;

data/patches/perftools-debug.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index a7a4fb5..bfa0347 100644
+index c3bf409..c613939 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1067,13 +1067,13 @@ AUTOMAKE = @AUTOMAKE@
+@@ -1367,13 +1367,13 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@

data/patches/perftools-gc.patch

@@ -33,7 +33,7 @@ index e6240d9..b901ee8 100644
    if (!enabled()) {
      return;
 diff --git a/src/profiledata.h b/src/profiledata.h
-index 67c463d..1df79c2 100644
+index 67c463d..a68e12f 100644
 --- a/src/profiledata.h
 +++ b/src/profiledata.h
 @@ -40,6 +40,12 @@
@@ -54,14 +54,14 @@ index 67c463d..1df79c2 100644
    void GetCurrentState(State* state) const;
  
 +#ifdef BUILD_FOR_RUBY
-+	void GcMark(void (*cb)(VALUE));
++  void GcMark(void (*cb)(VALUE));
 +#endif
 +
   private:
    static const int kAssociativity = 4;          // For hashtable
    static const int kBuckets = 1 << 10;          // For hashtable
 diff --git a/src/profiler.cc b/src/profiler.cc
-index 21c7669..b7277c7 100644
+index d89a53a..37234b2 100644
 --- a/src/profiler.cc
 +++ b/src/profiler.cc
 @@ -87,6 +87,10 @@ class CpuProfiler {
@@ -69,7 +69,7 @@ index 21c7669..b7277c7 100644
    void FlushTable();
  
 +#ifdef BUILD_FOR_RUBY
-+	void GcMark(void (*cb)(VALUE));
++  void GcMark(void (*cb)(VALUE));
 +#endif
 +
    bool Enabled();
@@ -81,27 +81,27 @@ index 21c7669..b7277c7 100644
  
 +#ifdef BUILD_FOR_RUBY
 +void CpuProfiler::GcMark(void (*cb)(VALUE)) {
-+	if (!collector_.enabled()) {
-+		return;
-+	}
++  if (!collector_.enabled()) {
++    return;
++  }
 +
-+	collector_.GcMark(cb);
++  collector_.GcMark(cb);
 +}
 +#endif
 +
  bool CpuProfiler::Enabled() {
    SpinLockHolder cl(&lock_);
    return collector_.enabled();
-@@ -300,6 +314,12 @@ extern "C" void ProfilerFlush() {
+@@ -300,6 +314,12 @@ extern "C" PERFTOOLS_DLL_DECL void ProfilerFlush() {
    CpuProfiler::instance_.FlushTable();
  }
  
 +#ifdef BUILD_FOR_RUBY
-+extern "C" void ProfilerGcMark(void (*cb)(VALUE)) {
++extern "C" PERFTOOLS_DLL_DECL void ProfilerGcMark(void (*cb)(VALUE)) {
 +  CpuProfiler::instance_.GcMark(cb);
 +}
 +#endif
 +
- extern "C" int ProfilingIsEnabledForAllThreads() {
+ extern "C" PERFTOOLS_DLL_DECL int ProfilingIsEnabledForAllThreads() {
    return CpuProfiler::instance_.Enabled();
  }

data/patches/perftools-osx-106.patch

@@ -0,0 +1,96 @@
+diff --git a/Makefile.in b/Makefile.in
+index c613939..1a901d5 100644
+--- a/Makefile.in
+diff --git a/src/base/sysinfo.cc b/src/base/sysinfo.cc
+index a2bc2a9..10b8886 100644
+--- a/src/base/sysinfo.cc
++++ b/src/base/sysinfo.cc
+@@ -728,26 +728,59 @@ bool ProcMapsIterator::NextExt(uint64 *start, uint64 *end, char **flags,
+ 
+     // We start with the next load command (we've already looked at this one).
+     for (current_load_cmd_--; current_load_cmd_ >= 0; current_load_cmd_--) {
+-      const char* lc = ((const char *)hdr + sizeof(struct mach_header));
++      const char* lc;
++      uint32_t seg_marker;
++      #if defined(MH_MAGIC_64)
++      if (hdr->magic == MH_MAGIC_64) {
++        lc = ((const char *)hdr + sizeof(struct mach_header_64));
++        seg_marker = LC_SEGMENT_64;
++      } else {
++      #endif
++        lc  = ((const char *)hdr + sizeof(struct mach_header));
++        seg_marker = LC_SEGMENT;
++      #if defined(MH_MAGIC_64)
++      }
++      #endif
+       // TODO(csilvers): make this not-quadradic (increment and hold state)
+       for (int j = 0; j < current_load_cmd_; j++)  // advance to *our* load_cmd
+         lc += ((const load_command *)lc)->cmdsize;
+-      if (((const load_command *)lc)->cmd == LC_SEGMENT) {
++      if (((const load_command *)lc)->cmd == seg_marker) {
+         const intptr_t dlloff = _dyld_get_image_vmaddr_slide(current_image_);
+-        const segment_command* sc = (const segment_command *)lc;
+-        if (start) *start = sc->vmaddr + dlloff;
+-        if (end) *end = sc->vmaddr + sc->vmsize + dlloff;
+-        if (flags) *flags = kDefaultPerms;  // can we do better?
+-        if (offset) *offset = sc->fileoff;
+-        if (inode) *inode = 0;
+-        if (filename)
+-          *filename = const_cast<char*>(_dyld_get_image_name(current_image_));
+-        if (file_mapping) *file_mapping = 0;
+-        if (file_pages) *file_pages = 0;   // could we use sc->filesize?
+-        if (anon_mapping) *anon_mapping = 0;
+-        if (anon_pages) *anon_pages = 0;
+-        if (dev) *dev = 0;
+-        return true;
++        #if defined(MH_MAGIC_64)
++        if (hdr->magic == MH_MAGIC_64) {
++          const segment_command_64* sc = (const segment_command_64 *)lc;
++          if (start) *start = sc->vmaddr + dlloff;
++          if (end) *end = sc->vmaddr + sc->vmsize + dlloff;
++          if (flags) *flags = kDefaultPerms;  // can we do better?
++          if (offset) *offset = sc->fileoff;
++          if (inode) *inode = 0;
++          if (filename)
++            *filename = const_cast<char*>(_dyld_get_image_name(current_image_));
++          if (file_mapping) *file_mapping = 0;
++          if (file_pages) *file_pages = 0;   // could we use sc->filesize?
++          if (anon_mapping) *anon_mapping = 0;
++          if (anon_pages) *anon_pages = 0;
++          if (dev) *dev = 0;
++          return true;
++        } else {
++        #endif
++          const segment_command* sc = (const segment_command *)lc;
++          if (start) *start = sc->vmaddr + dlloff;
++          if (end) *end = sc->vmaddr + sc->vmsize + dlloff;
++          if (flags) *flags = kDefaultPerms;  // can we do better?
++          if (offset) *offset = sc->fileoff;
++          if (inode) *inode = 0;
++          if (filename)
++            *filename = const_cast<char*>(_dyld_get_image_name(current_image_));
++          if (file_mapping) *file_mapping = 0;
++          if (file_pages) *file_pages = 0;   // could we use sc->filesize?
++          if (anon_mapping) *anon_mapping = 0;
++          if (anon_pages) *anon_pages = 0;
++          if (dev) *dev = 0;
++          return true;
++        #if defined(MH_MAGIC_64)
++        }
++        #endif
+       }
+     }
+     // If we get here, no more load_cmd's in this image talk about
+diff --git a/src/pprof b/src/pprof
+index 3531300..b256ed2 100755
+--- a/src/pprof
++++ b/src/pprof
+@@ -3193,7 +3193,7 @@ sub ParseTextSectionHeaderFromOtool {
+       $sectname = $1;
+     } elsif ($line =~ /segname (\w+)/) {
+       $segname = $1;
+-    } elsif (!($cmd eq "LC_SEGMENT" &&
++    } elsif (!(($cmd eq "LC_SEGMENT" || $cmd eq "LC_SEGMENT_64") &&
+ 	       $sectname eq "__text" &&
+ 	       $segname eq "__TEXT")) {
+       next;

data/patches/perftools-osx.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index e3690b2..a7a4fb5 100644
+index 566d77c..c3bf409 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1097,7 +1097,7 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -1397,7 +1397,7 @@ INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

data/patches/perftools-pprof.patch

@@ -0,0 +1,56 @@
+diff --git a/src/pprof b/src/pprof
+index b5ef29a..25b956d 100755
+--- a/src/pprof
++++ b/src/pprof
+@@ -530,7 +530,8 @@ sub Main() {
+   my $symbol_map = {};
+ 
+   # Read one profile, pick the last item on the list
+-  my $data = ReadProfile($main::prog, pop(@main::profile_files));
++  my $fname = pop(@main::profile_files);
++  my $data = ReadProfile($main::prog, $fname);
+   my $profile = $data->{profile};
+   my $pcs = $data->{pcs};
+   my $libs = $data->{libs};   # Info about main program and shared libraries
+@@ -567,6 +568,17 @@ sub Main() {
+     $symbols = ExtractSymbols($libs, $pcs);
+   }
+ 
++  if (-e "$fname.symbols") {
++    open(SYMBOLS, "<$fname.symbols");
++    while(<SYMBOLS>){
++      chop;
++      if (m/(.+?)\s*:\s*(.*)/){
++        $symbols->{$1}[0] = $2;
++      }
++    }
++    close(SYMBOLS);
++  }
++
+   # Remove uniniteresting stack items
+   $profile = RemoveUninterestingFrames($symbols, $profile);
+ 
+@@ -1927,6 +1927,7 @@ sub RemoveUninterestingFrames {
+ 		      'ProfileData::prof_handler',  # historical
+ 		      'CpuProfiler::prof_handler',
+                       '__FRAME_END__',
++		      'PerfTools::CpuProfiler.start',
+ 		      '__pthread_sighandler',
+ 		      '__restore') {
+       $skip{$name} = 1;
+@@ -1935,6 +1936,7 @@ sub RemoveUninterestingFrames {
+     # Nothing skipped for unknown types
+   }
+ 
++=pod
+   if ($main::profile_type eq 'cpu') {
+     # If all the second-youngest program counters are the same,
+     # this STRONGLY suggests that it is an artifact of measurement,
+@@ -1959,6 +1961,7 @@ sub RemoveUninterestingFrames {
+       $profile = $result;
+     }
+   }
++=cut
+ 
+   my $result = {};
+   foreach my $k (keys(%{$profile})) {

data/patches/perftools.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index 8ba85fb..e3690b2 100644
+index 232d2ec..566d77c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1067,13 +1067,13 @@ AUTOMAKE = @AUTOMAKE@
+@@ -1367,13 +1367,13 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
@@ -18,38 +18,6 @@ index 8ba85fb..e3690b2 100644
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
-diff --git a/src/pprof b/src/pprof
-index 9d4d0e8..a41fcb1 100755
---- a/src/pprof
-+++ b/src/pprof
-@@ -504,7 +504,8 @@ sub Main() {
-   FetchDynamicProfiles();
-     
-   # Read one profile, pick the last item on the list
--  my $data = ReadProfile($main::prog, pop(@main::profile_files));
-+  my $fname = pop(@main::profile_files);
-+  my $data = ReadProfile($main::prog, $fname);
-   my $profile = $data->{profile};
-   my $pcs = $data->{pcs};
-   my $libs = $data->{libs};   # Info about main program and shared libraries
-@@ -549,6 +550,17 @@ sub Main() {
-     $profile = IgnoreProfile($symbols, $profile, $main::opt_ignore);
-   }
- 
-+  if (-e "$fname.symbols") {
-+    open(SYMBOLS, "<$fname.symbols");
-+    while(<SYMBOLS>){
-+      chop;
-+      if (m/(.+?)\s*:\s*(.*)/){
-+        $symbols->{$1}[0] = $2;
-+      }
-+    }
-+    close(SYMBOLS);
-+  }
-+
-   my $calls = ExtractCalls($symbols, $profile);
- 
-   # Reduce profiles to required output granularity, and also clean
 diff --git a/src/profile-handler.cc b/src/profile-handler.cc
 index e658d30..370d012 100644
 --- a/src/profile-handler.cc
@@ -227,7 +195,7 @@ index da7ea9e..67c463d 100644
  
    // Move 'entry' to the eviction buffer.
 diff --git a/src/profiler.cc b/src/profiler.cc
-index c51c7b2..21c7669 100644
+index 183a7c7..d89a53a 100644
 --- a/src/profiler.cc
 +++ b/src/profiler.cc
 @@ -63,6 +63,12 @@ typedef int ucontext_t;   // just to quiet the compiler, mostly
@@ -283,7 +251,7 @@ index d158eea..e8509fe 100644
  #endif
 +#endif
 diff --git a/src/stacktrace_with_context.cc b/src/stacktrace_with_context.cc
-index 02f837d..ca5da92 100644
+index ed7bfe3..a90c070 100644
 --- a/src/stacktrace_with_context.cc
 +++ b/src/stacktrace_with_context.cc
 @@ -41,6 +41,7 @@

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.2.5'
-  s.date = '2009-09-16'
+  s.version = '0.3.1'
+  s.date = '2009-10-10'
   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'
@@ -9,22 +9,25 @@ spec = Gem::Specification.new do |s|
   s.homepage = "http://github.com/tmm1/perftools.rb"
 
   s.authors = ["Aman Gupta"]
-  s.email = "aman@tmm1.net"
+  s.email = "perftools@tmm1.net"
 
   s.has_rdoc = false
   s.extensions = 'ext/extconf.rb'
   s.bindir = 'bin'
   s.executables << 'pprof.rb'
 
-  # ruby -rpp -e' pp `git ls-files | grep -v examples`.split("\n") '
+  # ruby -rpp -e' pp `git ls-files | grep -v examples`.split("\n").sort '
   s.files = [
     "README",
     "bin/pprof.rb",
     "ext/extconf.rb",
     "ext/perftools.c",
+    "ext/src/google-perftools-1.4.tar.gz",
     "patches/perftools-debug.patch",
     "patches/perftools-gc.patch",
+    "patches/perftools-osx-106.patch",
     "patches/perftools-osx.patch",
+    "patches/perftools-pprof.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.2.5
+  version: 0.3.1
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
+date: 2009-10-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: A sampling profiler for ruby code based on patches to google-perftools
-email: aman@tmm1.net
+email: perftools@tmm1.net
 executables: 
 - pprof.rb
 extensions: 
@@ -26,9 +26,12 @@ files:
 - bin/pprof.rb
 - ext/extconf.rb
 - ext/perftools.c
+- ext/src/google-perftools-1.4.tar.gz
 - patches/perftools-debug.patch
 - patches/perftools-gc.patch
+- patches/perftools-osx-106.patch
 - patches/perftools-osx.patch
+- patches/perftools-pprof.patch
 - patches/perftools.patch
 - perftools.rb.gemspec
 has_rdoc: true