perftools.rb 0.4.5 → 0.4.6

data/ext/perftools.c

@@ -1,3 +1,5 @@
+#include <ruby.h> // include this before anything else, as it defines _GNU_SOURCE etc
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -6,13 +8,13 @@
 #endif
 
 #include <assert.h>
-#include <ruby.h>
 
 void ProfilerGcMark(void (*cb)(VALUE));
-int ProfilerStart(const char*);
+int  ProfilerStart(const char*);
 void ProfilerStop();
 void ProfilerFlush();
 void ProfilerRecord(int, void*, void*);
+int  ProfilingIsEnabledForAllThreads();
 
 static VALUE Iallocate;
 static VALUE I__send__;
@@ -213,6 +215,7 @@ static VALUE objprofiler_teardown();
 
 static VALUE cPerfTools;
 static VALUE cCpuProfiler;
+static VALUE eError;
 static VALUE bProfilerRunning;
 static VALUE gc_hook;
 
@@ -229,12 +232,10 @@ cpuprofiler_stop(VALUE self)
     return Qfalse;
 
   bProfilerRunning = Qfalse;
+  objprofiler_teardown();
   ProfilerStop();
   ProfilerFlush();
 
-  if (getenv("CPUPROFILE_OBJECTS"))
-    objprofiler_teardown();
-
   return Qtrue;
 }
 
@@ -244,13 +245,16 @@ cpuprofiler_start(VALUE self, VALUE filename)
   StringValue(filename);
 
   if (bProfilerRunning)
-    return Qfalse;
+    rb_raise(eError, "profiler is already running");
 
   if (getenv("CPUPROFILE_OBJECTS"))
     objprofiler_setup();
 
-  ProfilerStart(RSTRING_PTR(filename));
-  bProfilerRunning = Qtrue;
+  if (ProfilerStart(RSTRING_PTR(filename))) {
+    bProfilerRunning = Qtrue;
+  } else {
+    rb_raise(eError, "profiler could not be started");
+  }
 
   if (rb_block_given_p()) {
     rb_yield(Qnil);
@@ -292,35 +296,36 @@ page_align(void *addr) {
 }
 
 static void
-unprotect_page(void *addr) {
+unprotect_page(char *addr) {
   assert(addr != NULL);
-  void *aligned_addr = page_align(addr);
+  char *aligned_addr = page_align(addr);
   if (mprotect(aligned_addr, (addr - aligned_addr), PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
     perror("mprotect");
 }
 
-static inline void**
+static inline char**
 uc_get_ip(ucontext_t *uc) {
-  #if defined(__FreeBSD__)
-    return (void**)&uc->uc_mcontext.mc_rip;
-  #elif defined(__dietlibc__)
-    return (void**)&uc->uc_mcontext.rip;
-  #elif defined(__APPLE__)
-    #if defined(__LP64__)
-      return (void**)&uc->uc_mcontext->__ss.__rip;
-    #else
-      return (void**)&uc->uc_mcontext->__ss.__eip;
-    #endif
-  #else
-    return (void**)&uc->uc_mcontext.gregs[REG_RIP];
-  #endif
+# if defined(__FreeBSD__)
+#  define program_counter uc_mcontext.mc_rip
+# elif defined(__dietlibc__)
+#  define program_counter uc_mcontext.rip
+# elif defined(__APPLE__)
+#   ifdef __LP64__
+#     define program_counter uc_mcontext->__ss.__rip
+#   else
+#     define program_counter uc_mcontext->__ss.__eip
+#   endif
+# else
+#  define program_counter uc_mcontext.gregs[REG_RIP]
+# endif
+  return (char**)&uc->program_counter;
 }
 
 static void
 trap_handler(int sig, siginfo_t *info, void *data) {
   int i;
   ucontext_t *uc = (ucontext_t *)data;
-  void **ip = uc_get_ip(uc);
+  char **ip = uc_get_ip(uc);
 
   // printf("signal: %d, addr: %p, ip: %p\n", signal, info->si_addr, *ip);
 
@@ -355,10 +360,10 @@ objprofiler_setup()
   sigemptyset(&sig.sa_mask);
   sigaction(SIGTRAP, &sig, NULL);
 
-  unprotect_page(rb_newobj);
+  unprotect_page((char*)rb_newobj);
 
   for (i=0; i<NUM_ORIG_BYTES; i++) {
-    orig_bytes[i].location = (char *)(rb_newobj + i);
+    orig_bytes[i].location = (char *)rb_newobj + i;
     orig_bytes[i].value    = ((unsigned char*)rb_newobj)[i];
     orig_bytes[i].location[0] = '\xCC';
   }
@@ -390,10 +395,17 @@ objprofiler_teardown()
 
 /* Init */
 
+static void
+profiler_at_exit(VALUE self)
+{
+  cpuprofiler_stop(self);
+}
+
 void
 Init_perftools()
 {
   cPerfTools = rb_define_class("PerfTools", rb_cObject);
+  eError = rb_define_class_under(cPerfTools, "Error", rb_eStandardError);
   cCpuProfiler = rb_define_class_under(cPerfTools, "CpuProfiler", rb_cObject);
 
   Iallocate = rb_intern("allocate");
@@ -409,6 +421,13 @@ Init_perftools()
   gc_hook = Data_Wrap_Struct(cCpuProfiler, cpuprofiler_gc_mark, NULL, NULL);
   rb_global_variable(&gc_hook);
 
-  if (getenv("CPUPROFILE") && getenv("CPUPROFILE_OBJECTS"))
-    objprofiler_setup();
+  if (ProfilingIsEnabledForAllThreads()) { // profiler is already running?
+    bProfilerRunning = Qtrue;
+
+    if (getenv("CPUPROFILE_OBJECTS")) {    // want to profile objects
+      objprofiler_setup();
+    }
+
+    rb_set_end_proc(profiler_at_exit, 0);  // make sure to cleanup before the VM shuts down
+  }
 }

data/perftools.rb.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '0.4.5'
+  s.version = '0.4.6'
   s.date = '2010-08-03'
   s.rubyforge_project = 'perftools-rb'
   s.summary = 'google-perftools for ruby code'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Aman Gupta
@@ -49,21 +54,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: google-perftools for ruby code