perftools.rb 2.0.0 → 2.0.1

data/ext/extconf.rb

@@ -13,17 +13,21 @@ require 'fileutils'
 
 if RUBY_VERSION >= "1.9"
   begin
-    require "ruby_core_source"
+    require "debugger/ruby_core_source"
   rescue LoadError
     require 'rubygems/user_interaction' # for 1.9.1
     require 'rubygems/dependency_installer'
     installer = Gem::DependencyInstaller.new
-    installer.install 'ruby_core_source'
+    installer.install 'debugger-ruby_core_source'
 
     Gem.refresh
-    Gem.activate('ruby_core_source') # for 1.9.1
+    if Gem.method_defined? :activate
+      Gem.activate('debugger-ruby_core_source') # for 1.9.1
+    else
+      Gem::Specification.find_by_name('debugger-ruby_core_source').activate
+    end
 
-    require "ruby_core_source"
+    require "debugger/ruby_core_source"
   end
 end
 
@@ -52,7 +56,8 @@ Dir.chdir('src') do
       ['perftools-debug', true],
       ['perftools-objects', true],
       ['perftools-frames', true],
-      ['perftools-realtime', true]
+      ['perftools-realtime', true],
+      ['perftools-pause', true]
     ].each do |patch, apply|
       if apply
         sys("patch -p1 < ../../../patches/#{patch}.patch")
@@ -101,10 +106,10 @@ if RUBY_VERSION >= "1.9"
     have_header("insns_info.inc")
   }
 
-  unless Ruby_core_source::create_makefile_with_core(hdrs, "perftools")
+  unless Debugger::RubyCoreSource::create_makefile_with_core(hdrs, "perftools")
     STDERR.puts "\n\n"
     STDERR.puts "***************************************************************************************"
-    STDERR.puts "********************** Ruby_core_source::create_makefile FAILED ***********************"
+    STDERR.puts "****************** Debugger::RubyCoreSource::create_makefile FAILED *******************"
     STDERR.puts "***************************************************************************************"
     exit(1)
   end

data/ext/perftools.c

@@ -14,6 +14,8 @@ void ProfilerGcMark(void (*cb)(VALUE));
 int  ProfilerStart(const char*);
 void ProfilerStop();
 void ProfilerFlush();
+void ProfilerPause();
+void ProfilerResume();
 void ProfilerRecord(int, void*, void*);
 int  ProfilingIsEnabledForAllThreads();
 
@@ -21,6 +23,10 @@ static VALUE Iallocate;
 static VALUE I__send__;
 static VALUE Isend;
 
+#ifndef ID_ALLOCATOR
+#define ID_ALLOCATOR Iallocate
+#endif
+
 #define SAVE_FRAME() \
   if (method && method != I__send__ && method != Isend) { \
     if (self && FL_TEST(klass, FL_SINGLETON) && (BUILTIN_TYPE(self) == T_CLASS || BUILTIN_TYPE(self) == T_MODULE)) \
@@ -123,15 +129,25 @@ static VALUE Isend;
   #include <vm_core.h>
   #include <iseq.h>
 
-// Fix compile error in ruby 1.9.3
+// Fix compile error in ruby 1.9.3 and 2.0.0
 #ifdef RTYPEDDATA_DATA
-#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+  #if GET_THREAD
+    #define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+    #define GET_THREAD2 GET_THREAD
+  #else
+    rb_thread_t *ruby_current_thread;
+    rb_thread_t *GET_THREAD2(void)
+    {
+      ruby_current_thread = ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()));
+      return GET_THREAD();
+    }
+  #endif 
 #endif
 
   int
   rb_stack_trace(void** result, int max_depth)
   {
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = GET_THREAD2();
     rb_control_frame_t *cfp = th->cfp;
     rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
 
@@ -188,7 +204,7 @@ static VALUE Isend;
   void
   rb_dump_stack()
   {
-    rb_thread_t *th = GET_THREAD();
+    rb_thread_t *th = GET_THREAD2();
     rb_control_frame_t *cfp = th->cfp;
     rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
     ID func;
@@ -228,8 +244,15 @@ static VALUE cPerfTools;
 static VALUE cCpuProfiler;
 static VALUE eError;
 static VALUE bProfilerRunning;
+static VALUE bProfilerPaused;
 static VALUE gc_hook;
 
+static VALUE
+cpuprofiler_paused_p(VALUE self)
+{
+  return bProfilerPaused;
+}
+
 static VALUE
 cpuprofiler_running_p(VALUE self)
 {
@@ -237,14 +260,60 @@ cpuprofiler_running_p(VALUE self)
 }
 
 static VALUE
-cpuprofiler_stop(VALUE self)
+cpuprofiler_pause(VALUE self)
+{
+  if (!bProfilerRunning)
+    return Qfalse;
+  if (bProfilerPaused)
+    return Qfalse;
+
+  bProfilerPaused = Qtrue;
+  ProfilerPause();
+
+  return Qtrue;
+}
+
+static VALUE
+cpuprofiler_resume(VALUE self)
 {
   if (!bProfilerRunning)
     return Qfalse;
+  if (!bProfilerPaused)
+    return Qfalse;
+
+  bProfilerPaused = Qfalse;
+  ProfilerResume();
 
+  return Qtrue;
+}
+
+static VALUE
+cpuprofiler_flush(VALUE self)
+{
+  if (!bProfilerRunning)
+    return Qfalse;
+  if (bProfilerPaused)
+    ProfilerResume();
+  ProfilerFlush();
+  if (bProfilerPaused)
+    ProfilerPause();
+  return Qtrue;
+}
+
+static VALUE
+cpuprofiler_stop(VALUE self)
+{
+  if (!bProfilerRunning)
+    return Qfalse;
   bProfilerRunning = Qfalse;
+
   objprofiler_teardown();
   methprofiler_teardown();
+
+  if (bProfilerPaused)
+    ProfilerResume();
+  bProfilerPaused = Qfalse;
+
   ProfilerStop();
   ProfilerFlush();
 
@@ -476,10 +545,15 @@ Init_perftools()
   Isend = rb_intern("send");
 
   bMethProfilerRunning = bObjProfilerRunning = bProfilerRunning = Qfalse;
+  bProfilerPaused = Qfalse;
 
   rb_define_singleton_method(cCpuProfiler, "running?", cpuprofiler_running_p, 0);
   rb_define_singleton_method(cCpuProfiler, "start", cpuprofiler_start, 1);
   rb_define_singleton_method(cCpuProfiler, "stop", cpuprofiler_stop, 0);
+  rb_define_singleton_method(cCpuProfiler, "paused?", cpuprofiler_paused_p, 0);
+  rb_define_singleton_method(cCpuProfiler, "pause", cpuprofiler_pause, 0);
+  rb_define_singleton_method(cCpuProfiler, "resume", cpuprofiler_resume, 0);
+  rb_define_singleton_method(cCpuProfiler, "flush", cpuprofiler_flush, 0);
 
   gc_hook = Data_Wrap_Struct(cCpuProfiler, cpuprofiler_gc_mark, NULL, NULL);
   rb_global_variable(&gc_hook);

data/patches/perftools-pause.patch

@@ -0,0 +1,58 @@
+diff --git a/src/gperftools/profiler.h b/src/gperftools/profiler.h
+index 7971e04..5093604 100644
+--- a/src/gperftools/profiler.h
++++ b/src/gperftools/profiler.h
+@@ -138,6 +138,8 @@ PERFTOOLS_DLL_DECL void ProfilerStop();
+  */
+ PERFTOOLS_DLL_DECL void ProfilerFlush();
+ 
++PERFTOOLS_DLL_DECL void ProfilerPause();
++PERFTOOLS_DLL_DECL void ProfilerResume();
+ 
+ /* DEPRECATED: these functions were used to enable/disable profiling
+  * in the current thread, but no longer do anything.
+diff --git a/src/profiler.cc b/src/profiler.cc
+index 2f1af06..7c404c3 100644
+--- a/src/profiler.cc
++++ b/src/profiler.cc
+@@ -129,6 +129,7 @@ class CpuProfiler {
+   // ProfileHandlerUnregisterCallback.
+   ProfileHandlerToken* prof_handler_token_;
+ 
++ public:
+   // Sets up a callback to receive SIGPROF interrupt.
+   void EnableHandler();
+ 
+@@ -346,6 +347,16 @@ extern "C" PERFTOOLS_DLL_DECL void ProfilerStop() {
+   CpuProfiler::instance_.Stop();
+ }
+ 
++#ifdef BUILD_FOR_RUBY
++extern "C" PERFTOOLS_DLL_DECL void ProfilerPause() {
++  CpuProfiler::instance_.DisableHandler();
++}
++
++extern "C" PERFTOOLS_DLL_DECL void ProfilerResume() {
++  CpuProfiler::instance_.EnableHandler();
++}
++#endif
++
+ extern "C" PERFTOOLS_DLL_DECL void ProfilerGetCurrentState(
+     ProfilerState* state) {
+   CpuProfiler::instance_.GetCurrentState(state);
+diff --git a/src/profiler.cc b/src/profiler.cc
+index 7c404c3..735a885 100644
+--- a/src/profiler.cc
++++ b/src/profiler.cc
+@@ -268,8 +268,9 @@ void CpuProfiler::EnableHandler() {
+ }
+ 
+ void CpuProfiler::DisableHandler() {
+-  RAW_CHECK(prof_handler_token_ != NULL, "SIGPROF handler is not registered");
+-  ProfileHandlerUnregisterCallback(prof_handler_token_);
++  //RAW_CHECK(prof_handler_token_ != NULL, "SIGPROF handler is not registered");
++  if (prof_handler_token_ != NULL)
++    ProfileHandlerUnregisterCallback(prof_handler_token_);
+   prof_handler_token_ = NULL;
+ }
+ 

data/perftools.rb.gemspec

@@ -1,9 +1,9 @@
 spec = Gem::Specification.new do |s|
   s.name = 'perftools.rb'
-  s.version = '2.0.0'
+  s.version = '2.0.1'
   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'
+  s.summary = 'gperftools for ruby code'
+  s.description = 'A sampling profiler for ruby code based on patches to gperftools'
 
   s.homepage = "http://github.com/tmm1/perftools.rb"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perftools.rb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-17 00:00:00 -07:00
-default_executable: 
+date: 2013-05-23 00:00:00 Z
 dependencies: []
 
-description: A sampling profiler for ruby code based on patches to google-perftools
+description: A sampling profiler for ruby code based on patches to gperftools
 email: perftools@tmm1.net
 executables: 
 - pprof.rb
@@ -39,11 +38,11 @@ files:
 - patches/perftools-notests.patch
 - patches/perftools-objects.patch
 - patches/perftools-osx.patch
+- patches/perftools-pause.patch
 - patches/perftools-pprof.patch
 - patches/perftools-realtime.patch
 - patches/perftools.patch
 - perftools.rb.gemspec
-has_rdoc: false
 homepage: http://github.com/tmm1/perftools.rb
 licenses: []
 
@@ -73,9 +72,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: perftools-rb
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: google-perftools for ruby code
+summary: gperftools for ruby code
 test_files: []
 
+has_rdoc: false