perftools.rb 0.3.7 → 0.3.8

data/ext/extconf.rb

@@ -53,6 +53,9 @@ Dir.chdir('src') do
         sys("git commit -am '#{patch}'") if ENV['DEV']
       end
     end
+
+    sys("sed -i -e 's,SpinLock,ISpinLock,g' src/*.{cc,h} src/base/*.{cc,h}")
+    sys("git commit -am 'rename spinlock'") if ENV['DEV']
   end
 
   Dir.chdir(dir) do

data/ext/perftools.c

@@ -1,10 +1,17 @@
 #include <assert.h>
 #include <ruby.h>
+
+void ProfilerGcMark(void (*cb)(VALUE));
+int ProfilerStart(const char*);
+void ProfilerStop();
+void ProfilerFlush();
+
 static VALUE Iallocate;
 static VALUE I__send__;
+static VALUE Isend;
 
 #define SAVE_FRAME() \
-  if (method && method != I__send__) { \
+  if (method && method != I__send__ && !(method == Isend && klass == rb_cObject)) { \
     if (self && FL_TEST(klass, FL_SINGLETON) && (BUILTIN_TYPE(self) == T_CLASS || BUILTIN_TYPE(self) == T_MODULE)) \
       result[depth++] = (void*) self; \
     else \
@@ -15,8 +22,20 @@ static VALUE I__send__;
   }
 
 #ifdef RUBY18
-  #include <node.h>
   #include <env.h>
+  #include <node.h>
+  #include <setjmp.h>
+  #include <signal.h>
+
+  static jmp_buf saved_location;
+  static sig_t saved_handler = NULL;
+
+  void
+  segv_handler(int sig)
+  {
+    assert(saved_handler);
+    _longjmp(saved_location, 1);
+  }
 
   int
   rb_stack_trace(void** result, int max_depth)
@@ -38,6 +57,17 @@ static VALUE I__send__;
     }
     #endif
 
+    // should not be possible to get here and already have a saved signal handler
+    assert(!saved_handler);
+
+    // ruby_frame is occasionally inconsistent, so temporarily catch segfaults
+    saved_handler = signal(SIGSEGV, segv_handler);
+    if (_setjmp(saved_location)) {
+      signal(SIGSEGV, saved_handler);
+      saved_handler = NULL;
+      return 0;
+    }
+
     /*
     // XXX does it make sense to track allocations or not?
     if (frame->last_func == ID_ALLOCATOR) {
@@ -54,7 +84,7 @@ static VALUE I__send__;
     */
 
     for (; frame && (n = frame->node); frame = frame->prev) {
-      if (frame->prev > 0xff && frame->prev->last_func) {
+      if (frame->prev && frame->prev->last_func) {
         if (frame->prev->node == n) {
           if (frame->prev->last_func == frame->last_func) continue;
         }
@@ -69,14 +99,17 @@ static VALUE I__send__;
       }
     }
 
+    signal(SIGSEGV, saved_handler);
+    saved_handler = NULL;
+
     assert(depth <= max_depth);
     return depth;
   }
 #endif
 
 #ifdef RUBY19
-  #include <vm_core.h>
   #include <iseq.h>
+  #include <vm_core.h>
 
   int
   rb_stack_trace(void** result, int max_depth)
@@ -216,6 +249,7 @@ Init_perftools()
   bProfilerRunning = Qfalse;
   Iallocate = rb_intern("allocate");
   I__send__ = rb_intern("__send__");
+  Isend = rb_intern("send");
 
   rb_define_singleton_method(cCpuProfiler, "running?", cpuprofiler_running_p, 0);
   rb_define_singleton_method(cCpuProfiler, "start", cpuprofiler_start, 1);

data/perftools.rb.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.3.7'
-  s.date = '2009-11-03'
+  s.version = '0.3.8'
+  s.date = '2009-11-11'
   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.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []