perftools.rb 0.3.2 → 0.3.5

data/ext/extconf.rb

@@ -33,13 +33,25 @@ Dir.chdir('src') do
 
   sys("tar zxvf #{perftools}")
   Dir.chdir(dir) do
-    sys("patch -p1 < ../../../patches/perftools.patch")
-    sys("patch -p1 < ../../../patches/perftools-notests.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")
+    if ENV['DEV']
+      sys("git init")
+      sys("git add .")
+      sys("git commit -m 'initial source'")
+    end
+
+    [ ['perftools', true],
+      ['perftools-notests', true],
+      ['perftools-pprof', true],
+      ['perftools-gc', true],
+      ['perftools-osx', RUBY_PLATFORM =~ /darwin/],
+      ['perftools-osx-106', RUBY_PLATFORM =~ /darwin10/],
+      ['perftools-debug', true]
+    ].each do |patch, apply|
+      if apply
+        sys("patch -p1 < ../../../patches/#{patch}.patch")
+        sys("git commit -am '#{patch}'") if ENV['DEV']
+      end
+    end
   end
 
   Dir.chdir(dir) do
@@ -77,7 +89,6 @@ if RUBY_VERSION >= "1.9"
     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"

data/ext/perftools.c

@@ -1,10 +1,11 @@
+#include <assert.h>
 #include <ruby.h>
 static VALUE Iallocate;
 static VALUE I__send__;
 
 #define SAVE_FRAME() \
-  if (method != I__send__) { \
-    if (FL_TEST(klass, FL_SINGLETON) && (BUILTIN_TYPE(self) == T_CLASS || BUILTIN_TYPE(self) == T_MODULE)) \
+  if (method && method != I__send__) { \
+    if (self && FL_TEST(klass, FL_SINGLETON) && (BUILTIN_TYPE(self) == T_CLASS || BUILTIN_TYPE(self) == T_MODULE)) \
       result[depth++] = (void*) self; \
     else \
       result[depth++] = 0; \
@@ -68,6 +69,7 @@ static VALUE I__send__;
       }
     }
 
+    assert(depth <= max_depth);
     return depth;
   }
 #endif
@@ -90,24 +92,25 @@ static VALUE I__send__;
     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) {
+    while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp) && depth+3 <= max_depth) {
       rb_iseq_t *iseq = cfp->iseq;
 
       if (iseq && iseq->type == ISEQ_TYPE_METHOD) {
-        self = iseq->self;
+        self = 0; // maybe use cfp->self here, but iseq->self is a ISeq ruby obj
         klass = iseq->klass;
         method = iseq->defined_method_id;
         SAVE_FRAME();
       }
 
-      switch(VM_FRAME_TYPE(cfp)) {
+      if (depth+3 > max_depth)
+        break;
+
+      switch (VM_FRAME_TYPE(cfp)) {
         case VM_FRAME_MAGIC_METHOD:
         case VM_FRAME_MAGIC_CFUNC:
           self = cfp->self;
@@ -120,6 +123,7 @@ static VALUE I__send__;
       cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
 
+    assert(depth <= max_depth);
     return depth;
   }
 

data/patches/perftools.patch

@@ -122,7 +122,7 @@ index 5f2531b..e6240d9 100644
    start_time_ = time(NULL);
    fname_ = strdup(fname);
  
-@@ -166,16 +203,47 @@ void ProfileData::Stop() {
+@@ -166,16 +203,52 @@ void ProfileData::Stop() {
      return;
    }
  
@@ -143,22 +143,27 @@ index 5f2531b..e6240d9 100644
 +        Entry e = bucket->entry[a];
 +        Evict(e);
 +#ifdef BUILD_FOR_RUBY
-+        if (e.depth > 1)
++        if (e.depth > 1) {
 +          for (int n=0; n<e.depth; n+=3) {
-+            ID sym = e.stack[n] + e.stack[n+1] + e.stack[n+2];
++            VALUE self = e.stack[n];
++            VALUE klass = e.stack[n+1];
++            ID method = e.stack[n+2];
++
++            ID sym = self + klass + method; // unique identifer
 +
 +            if (known_symbols.find(sym) == known_symbols.end()) {
 +              fprintf(symbols, "%0*lx: ", sizeof(unsigned long)*2, sym);
 +
-+              if (e.stack[n])
-+                fprintf(symbols, "%s.", rb_class2name(e.stack[n]));
-+              else
-+                fprintf(symbols, "%s#", rb_class2name(e.stack[n+1]));
++              if (self) { // class method
++                fprintf(symbols, "%s.%s\n", rb_class2name(self), rb_id2name(method));
++              } else { // instance method
++                fprintf(symbols, "%s#%s\n", rb_class2name(klass), rb_id2name(method));
++              }
 +
-+              fprintf(symbols, "%s\n", rb_id2name(e.stack[n+2]));
 +              known_symbols.insert(sym);
 +            }
 +          }
++        }
 +#endif
        }
      }

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.3.2'
-  s.date = '2009-10-10'
+  s.version = '0.3.5'
+  s.date = '2009-10-13'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: google-perftools for ruby code