ruby-prof 0.8.1 → 0.8.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'date'
 
 # ------- Version ----
 # Read version from header file
-version_header = File.read('ext/version.h')
+version_header = File.read('ext/ruby_prof/version.h')
 match = version_header.match(/RUBY_PROF_VERSION\s*["](\d.+)["]/)
 raise(RuntimeError, "Could not determine RUBY_PROF_VERSION") if not match
 RUBY_PROF_VERSION = match[1]
@@ -21,9 +21,10 @@ FILES = FileList[
   'bin/*',
   'doc/**/*',
   'examples/*',
-  'ext/*',
-  'ext/mingw/Rakefile',
-  'ext/mingw/build.rake',
+  'ext/ruby_prof/*.c',
+  'ext/ruby_prof/*.h',
+  'ext/ruby_prof/mingw/Rakefile',
+  'ext/ruby_prof/mingw/build.rake',
   'ext/vc/*.sln',
   'ext/vc/*.vcproj',
   'lib/**/*',
@@ -54,18 +55,28 @@ EOF
   spec.require_path = "lib" 
   spec.bindir = "bin"
   spec.executables = ["ruby-prof"]
-  spec.extensions = ["ext/extconf.rb"]
+  spec.extensions = ["ext/ruby_prof/extconf.rb"]
   spec.files = FILES.to_a
   spec.test_files = Dir["test/test_*.rb"]
-  
-
   spec.required_ruby_version = '>= 1.8.4'
   spec.date = DateTime.now
   spec.rubyforge_project = 'ruby-prof'
   spec.add_development_dependency 'os'
+  spec.add_development_dependency 'rake-compiler'
   
 end
 
+
+desc 'build native .gem files -- use like "native_gems clobber cross native gem"--for non native gem creation use "native_gems clobber" then "clean gem"'
+task :native_gems do
+  ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('ruby_prof', default_spec) do |ext|
+    ext.cross_compile = true
+    ext.cross_platform = ['x86-mswin32-60', 'x86-mingw32-60']
+  end
+end
+
 # Rake task to build the default package
 Rake::GemPackageTask.new(default_spec) do |pkg|
   pkg.need_tar = true
@@ -73,22 +84,6 @@ Rake::GemPackageTask.new(default_spec) do |pkg|
 end
 
 
-# ------- Windows Package ----------
-if RUBY_PLATFORM.match(/win32/)
-  binaries = (FileList['ext/mingw/*.so',
-                       'ext/mingw/*.dll*'])
-
-  # Windows specification
-  win_spec = default_spec.clone
-  win_spec.extensions = ['ext/mingw/Rakefile']
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-
-  # Rake task to build the windows package
-  Rake::GemPackageTask.new(win_spec) do |pkg|
-  end
-end
-
 # ---------  RDoc Documentation ------
 desc "Generate rdoc documentation"
 Rake::RDocTask.new("rdoc") do |rdoc|
@@ -104,9 +99,9 @@ Rake::RDocTask.new("rdoc") do |rdoc|
                           'examples/graph.txt',
                           'examples/graph.html',
                           'lib/**/*.rb',
-                          'ext/ruby_prof.c',
-                          'ext/version.h',
-                          'ext/measure_*.h',
+                          'ext/ruby_prof/ruby_prof.c',
+                          'ext/ruby_prof/version.h',
+                          'ext/ruby_prof/measure_*.h',
                           'README',
                           'LICENSE')
 end
@@ -129,7 +124,7 @@ task :build do
 end
 
 def build(with_debug)
- Dir.chdir('ext') do
+ Dir.chdir('ext/ruby_prof') do
   unless File.exist? 'Makefile'
     if with_debug
       system(Gem.ruby + " -d extconf.rb")
@@ -139,18 +134,20 @@ def build(with_debug)
     system("make clean")
   end
   system("make")
-  FileUtils.cp 'ruby_prof.so', '../lib' 
+  FileUtils.cp 'ruby_prof.so', '../../lib' 
  end
 end
 
-desc 'build ruby_prof.so with verbose symbols enabled'
+desc 'build ruby_prof.so with (rather verbose) debugging enabled'
+
 task :build_debug do
  build(true)
 end
 
-task :clean do
+desc 'clean stuff'
+task :cleanr do
  FileUtils.rm 'lib/ruby_prof.so' if File.exist? 'lib/ruby_prof.so'
- Dir.chdir('ext') do
+ Dir.chdir('ext/ruby_prof') do
   if File.exist? 'Makefile'
     system("make clean")
     FileUtils.rm 'Makefile'
@@ -160,4 +157,4 @@ task :clean do
   end
  end
  system("rm -rf pkg")
-end
+end

data/ext/{extconf.rb → ruby_prof/extconf.rb}

@@ -31,10 +31,14 @@ have_func("rb_gc_heap_info")
 have_func("rb_gc_malloc_allocations")
 have_func("rb_gc_malloc_allocated_size")
 
-def add_define(name)
-  $defs.push("-D#{name}")
+def add_define(name, value = nil)
+  if value
+    $defs.push("-D#{name}=#{value}")
+  else
+    $defs.push("-D#{name}")
+  end
 end
 
 add_define 'DEBUG' if $DEBUG
-
+add_define("RUBY_VERSION", RUBY_VERSION.gsub('.', ''))
 create_makefile("ruby_prof")

data/ext/{measure_cpu_time.h → ruby_prof/measure_cpu_time.h}

@@ -29,7 +29,7 @@
 #if defined(_WIN32) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__)))
 #define MEASURE_CPU_TIME 2
 
-static unsigned long long cpu_frequency;
+static unsigned LONG_LONG cpu_frequency;
 
 #if defined(__GNUC__)
 
@@ -93,10 +93,10 @@ unsigned long long get_cpu_frequency()
 
 #elif defined(_WIN32)
 
-unsigned long long get_cpu_frequency()
+unsigned LONG_LONG get_cpu_frequency()
 {
-    unsigned long long x, y;
-    unsigned long long frequency;
+    unsigned LONG_LONG x, y;
+    unsigned LONG_LONG frequency;
     x = measure_cpu_time();
 
     /* Use the windows sleep function, not Ruby's */

data/ext/{ruby_prof.c → ruby_prof/ruby_prof.c}

@@ -1023,14 +1023,21 @@ prof_pop_threads()
     st_foreach(threads_tbl, pop_frames, (st_data_t) &now);
 }
 
+#if RUBY_VERSION == 190
+# error 1.9.0 not supported (ask for it if desired)
+#endif
 
-#ifdef RUBY_VM
+#if RUBY_VERSION == 191
+
+/* Avoid bugs in 1.9.1 */
 
-/* These are mostly to avoid bugs in core */
 static inline void walk_up_until_right_frame(prof_frame_t *frame, thread_data_t* thread_data, ID mid, VALUE klass, prof_measure_t now);
 void prof_install_hook();
 void prof_remove_hook();
 
+#endif
+
+#ifdef RUBY_VM
 static void
 prof_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE klass)
 #else
@@ -1095,7 +1102,7 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     thread = rb_thread_current();
     thread_id = rb_obj_id(thread);
     
-   # ifdef RUBY_VM
+   # if RUBY_VERSION == 191
      /* ensure that new threads are hooked [sigh] (bug in core) */
      prof_remove_hook();
      prof_install_hook();
@@ -1129,8 +1136,8 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
       {
         frame->line = rb_sourceline();        
         
-        # ifdef RUBY_VM
-          // disabled till I figure out why it causes
+        # if RUBY_VERSION == 191
+          // disabled it causes
           // us to lose valuable frame information...maybe mid comes in wrong sometimes?
           // walk_up_until_right_frame(frame, thread_data, mid, klass, now);
         # endif
@@ -1145,11 +1152,12 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     case RUBY_EVENT_CALL:
     case RUBY_EVENT_C_CALL:
     {
-        /* Get the current frame for the current thread. */
-        frame = stack_peek(thread_data->stack);
         prof_call_info_t *call_info = NULL;
         prof_method_t *method = NULL;
 
+        /* Get the current frame for the current thread. */
+        frame = stack_peek(thread_data->stack);
+
         /* Is this an include for a module?  If so get the actual
            module class since we want to combine all profiling
            results for that module. */
@@ -1206,7 +1214,7 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     {      
     	frame = pop_frame(thread_data, now);
       
-      # ifdef RUBY_VM
+      # if RUBY_VERSION == 191
         // we need to walk up the stack to find the right one [http://redmine.ruby-lang.org/issues/show/2610] (for now)
         // sometimes frames don't have line and source somehow [like blank]
         // if we hit one there's not much we can do...I guess...
@@ -1219,7 +1227,7 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     }
 }
 
-#ifdef RUBY_VM
+#if RUBY_VERSION == 191
 
 static inline void walk_up_until_right_frame(prof_frame_t *frame, thread_data_t* thread_data, ID mid, VALUE klass, prof_measure_t now) {
   // while it doesn't match, pop on up until we have found where we belong...

data/ext/ruby_prof/version.h

@@ -0,0 +1,4 @@
+#define RUBY_PROF_VERSION  "0.8.2"
+#define RUBY_PROF_VERSION_MAJ   0
+#define RUBY_PROF_VERSION_MIN   8
+#define RUBY_PROF_VERSION_MIC   2

data/lib/ruby-prof.rb

@@ -1,4 +1,11 @@
-require File.dirname(__FILE__) + "/../ext/ruby_prof" # .so
+# require the  .so file
+me = File.dirname(__FILE__) + '/'
+begin
+  # fat binaries
+  require "#{me}/#{RUBY_VERSION[0..2]}/ruby_prof"
+rescue Exception
+  require "#{me}/../ext/ruby_prof/ruby_prof"
+end
 
 require "ruby-prof/method_info"
 require "ruby-prof/call_info"
@@ -46,4 +53,4 @@ module RubyProf
   end
 end
 
-RubyProf::figure_measure_mode
+RubyProf::figure_measure_mode

data/lib/ruby-prof/call_tree_printer.rb

@@ -55,15 +55,11 @@ module RubyProf
       File.expand_path(method.source_file)
     end
 
-    def name(method)
-      "#{method.klass_name}::#{method.method_name}"
-    end
-
     def print_methods(thread_id, methods)
       methods.reverse_each do |method| 
         # Print out the file and method name
         @output << "fl=#{file(method)}\n"
-        @output << "fn=#{name(method)}\n"
+        @output << "fn=#{method_name(method)}\n"
 
         # Now print out the function line number and its self time
         @output << "#{method.line} #{convert(method.self_time)}\n"
@@ -71,7 +67,7 @@ module RubyProf
         # Now print out all the children methods
         method.children.each do |callee|
           @output << "cfl=#{file(callee.target)}\n"
-          @output << "cfn=#{name(callee.target)}\n"
+          @output << "cfn=#{method_name(callee.target)}\n"
           @output << "calls=#{callee.called} #{callee.line}\n"
 
           # Print out total times here!

data/test/current_failures_windows

@@ -1,8 +1,8 @@
 1.8 passes, 1.9 however...
 
   1) Failure:
-test_thread_timings(ThreadTest) [E:/dev/ruby/ruby-prof/test/thread_test.rb:76]:
-Expected 0 - 1.0 (1.0) to be < 0.01.
+test_flat_string_with_numbers(PrintersTest) [E:/dev/ruby/ruby-prof/test/printers_test.rb:68]:
+<2> expected but was
+<29>.
 
-43 tests, 410 assertions, 1 failures, 0 errors, 0 skips
-rake aborted!
+which is expected until core backports a recent fix.

data/test/printers_test.rb

@@ -33,8 +33,9 @@ class PrintersTest < Test::Unit::TestCase
     printer.print
     
     printer = RubyProf::CallTreePrinter.new(@result)
-    printer.print(STDOUT)    
-    # we should get here    
+    printer.print(STDOUT)
+    
+    # we should get here
   end
 
   def test_flat_string
@@ -94,9 +95,9 @@ class PrintersTest < Test::Unit::TestCase
     output = ''
     printer = RubyProf::CallTreePrinter.new(@result)
     printer.print(output)
-
-    assert_match(/fn=Object::find_primes/i, output)
+    assert_match(/fn=Object#find_primes/i, output)
     assert_match(/events: wall_time/i, output)
+    assert_no_match(/d\d\d\d\d\d/, output) # old bug looked [in error] like Object::run_primes(d5833116)
   end
   
   def do_nothing

data/test/stack_test.rb

@@ -107,10 +107,10 @@ class StackTest < Test::Unit::TestCase
     method = methods[3]
     assert_equal('StackClass#c', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(5, method.total_time, 0.01)
+    assert_in_delta(5, method.total_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(5, method.children_time, 0.01)
+    assert_in_delta(5, method.children_time, 0.05)
     assert_equal(1, method.call_infos.length)
 
     call_info = method.call_infos[0]
@@ -121,10 +121,10 @@ class StackTest < Test::Unit::TestCase
     method = methods[4]
     assert_equal('StackClass#b', method.full_name)
     assert_equal(2, method.called)
-    assert_in_delta(4, method.total_time, 0.01)
+    assert_in_delta(4, method.total_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(4, method.children_time, 0.01)
+    assert_in_delta(4, method.children_time, 0.05)
     assert_equal(2, method.call_infos.length)
 
     call_info = method.call_infos[0]

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  hash: 59
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Shugo Maeda, Charlie Savage, Roger Pack
@@ -9,19 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: os
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: |
   ruby-prof is a fast code profiler for Ruby. It is a C extension and
   therefore is many times faster than the standard Ruby profiler. It
@@ -34,7 +58,7 @@ email: shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com
 executables: 
 - ruby-prof
 extensions: 
-- ext/extconf.rb
+- ext/ruby_prof/extconf.rb
 extra_rdoc_files: []
 
 files: 
@@ -42,27 +66,22 @@ files:
 - README
 - LICENSE
 - CHANGES
-- bin/go.rb
 - bin/ruby-prof
 - examples/flat.txt
 - examples/graph.html
 - examples/graph.txt
-- ext/extconf.rb
-- ext/measure_allocations.h
-- ext/measure_cpu_time.h
-- ext/measure_gc_runs.h
-- ext/measure_gc_time.h
-- ext/measure_memory.h
-- ext/measure_process_time.h
-- ext/measure_wall_time.h
-- ext/ruby186gc.patch
-- ext/ruby_prof.c
-- ext/ruby_prof.h
-- ext/version.h
-- ext/mingw/Rakefile
-- ext/mingw/build.rake
-- ext/vc/ruby_prof.sln
-- ext/vc/ruby_prof.vcproj
+- ext/ruby_prof/ruby_prof.c
+- ext/ruby_prof/measure_allocations.h
+- ext/ruby_prof/measure_cpu_time.h
+- ext/ruby_prof/measure_gc_runs.h
+- ext/ruby_prof/measure_gc_time.h
+- ext/ruby_prof/measure_memory.h
+- ext/ruby_prof/measure_process_time.h
+- ext/ruby_prof/measure_wall_time.h
+- ext/ruby_prof/ruby_prof.h
+- ext/ruby_prof/version.h
+- ext/ruby_prof/mingw/Rakefile
+- ext/ruby_prof/mingw/build.rake
 - lib/ruby-prof/abstract_printer.rb
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
@@ -76,6 +95,7 @@ files:
 - lib/ruby-prof/task.rb
 - lib/ruby-prof/test.rb
 - lib/ruby-prof.rb
+- lib/ruby_prof.so
 - lib/unprof.rb
 - rails/environment/profile.rb
 - rails/example/example_test.rb
@@ -104,6 +124,7 @@ files:
 - test/test_suite.rb
 - test/thread_test.rb
 - test/unique_call_path_test.rb
+- ext/ruby_prof/extconf.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-prof/
 licenses: []
@@ -114,21 +135,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 63
+      segments: 
+      - 1
+      - 8
+      - 4
       version: 1.8.4
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-prof
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fast Ruby profiler