bleak_house 3.2 → 3.3

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v3.3. Build Ruby in gem install step; bundle Ruby 1.8.6 source; fixes for truncated final frames.
+
 v3.2. Use Ccsv for faster parsing.
 
 v3.0.3. Caching; build task; impact factor.

data/Manifest

@@ -1,31 +1,33 @@
-TODO
-test/unit/test_bleak_house.rb
-test/misc/direct.rb
-README
-Rakefile
-patches/parse.y.patch
-patches/gc.c.patch
-Manifest
-LICENSE_RUBY
-LICENSE_BSD
-LICENSE
-lib/vendor/lightcsv.rb
-lib/bleak_house.rb
-lib/bleak_house/support/rake.rb
-lib/bleak_house/support/core_extensions.rb
-lib/bleak_house/support/build.rb
-lib/bleak_house/rails.rb
-lib/bleak_house/rails/dispatcher.rb
-lib/bleak_house/rails/bleak_house.rb
-lib/bleak_house/rails/action_controller.rb
-lib/bleak_house/logger.rb
-lib/bleak_house/logger/mem_usage.rb
-lib/bleak_house/analyzer.rb
-lib/bleak_house/analyzer/analyzer.rb
-install.rb
-init.rb
-ext/bleak_house/logger/snapshot.h
-ext/bleak_house/logger/snapshot.c
-ext/bleak_house/logger/extconf.rb
-CHANGELOG
 bin/bleak
+CHANGELOG
+ext/bleak_house/logger/build_logger.rb
+ext/bleak_house/logger/build_ruby.rb
+ext/bleak_house/logger/extconf.rb
+ext/bleak_house/logger/snapshot.c
+ext/bleak_house/logger/snapshot.h
+init.rb
+install.rb
+lib/bleak_house/analyzer/analyzer.rb
+lib/bleak_house/analyzer.rb
+lib/bleak_house/logger/mem_usage.rb
+lib/bleak_house/logger.rb
+lib/bleak_house/rails/action_controller.rb
+lib/bleak_house/rails/bleak_house.rb
+lib/bleak_house/rails/dispatcher.rb
+lib/bleak_house/rails.rb
+lib/bleak_house/support/core_extensions.rb
+lib/bleak_house/support/rake.rb
+lib/bleak_house.rb
+lib/vendor/lightcsv.rb
+LICENSE
+LICENSE_BSD
+LICENSE_RUBY
+Manifest
+Rakefile
+README
+ruby/gc.c.patch
+ruby/parse.y.patch
+ruby/ruby-1.8.6.tar.bz2
+test/misc/direct.rb
+test/unit/test_bleak_house.rb
+TODO

data/README

@@ -26,12 +26,9 @@ The public certificate for this gem is at http://rubyforge.org/frs/download.php/
 == Installation
 
 Install the gem:
-  sudo gem install bleak_house -v 3.0.2
+  sudo gem install bleak_house
 
-You need to compile the BleakHouse patched Ruby build. Run:
-  bleak --build
-  
-This gives you a Ruby binary named <tt>ruby-bleak-house</tt> alongside your regular binary.
+The installation takes a long time because it compiles a patched Ruby binary for you. It is installed as <tt>ruby-bleak-house</tt> alongside your regular <tt>ruby</tt>binary.
 
 == Profiling a Rails app
 

data/TODO

@@ -1,2 +1,2 @@
 
-* Per-object memory usage. This may be impossible to do accurately.
+* Some bug in the immortal detector; no results returned on the CHOW 2gb dump.

data/bin/bleak

@@ -1,15 +1,12 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+
 if !ARGV[0]
   puts "Please specify a BleakHouse logfile"
   exit
-elsif ARGV[0] == "--build"
-  require 'bleak_house/support/build'
 else
   $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib/"
-  unless self.respond_to? 'gem'
-    $LOAD_PATH << "/opt/local/lib/ruby/gems/1.8/gems/ccsv-0.0.1/lib/"
-  end
   require 'bleak_house/analyzer'
   BleakHouse::Analyzer.run(ARGV[0])
 end

data/ext/bleak_house/logger/build_logger.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+dir_config('snapshot')
+create_makefile('bleak_house/logger/snapshot')

data/ext/bleak_house/logger/build_ruby.rb

@@ -0,0 +1,61 @@
+
+if RUBY_PLATFORM =~ /win32|windows/
+  raise "Windows is not supported."
+end
+
+source_dir = File.expand_path(File.dirname(__FILE__)) + "/../../../ruby"
+tmp = "/tmp/"
+
+require 'fileutils'
+
+if `which ruby-bleak-house` =~ /no ruby-bleak-house in/
+  
+  Dir.chdir(tmp) do
+    build_dir = "bleak_house"
+    binary_dir = File.dirname(`which ruby`)
+    FileUtils.rm_rf(build_dir) rescue nil
+    Dir.mkdir(build_dir)
+  
+    begin
+      Dir.chdir(build_dir) do
+  
+        # Copy Ruby source
+        bz2 = "ruby-1.8.6.tar.bz2"
+        FileUtils.copy "#{source_dir}/#{bz2}", bz2
+  
+        # Extract
+        system("tar xjf #{bz2} > tar.log 2>&1")
+        File.delete bz2
+    
+        Dir.chdir("ruby-1.8.6") do
+  
+          # Patch
+          system("patch -p0 < \'#{source_dir}/gc.c.patch\' > ../gc.c.patch.log 2>&1")
+          system("patch -p0 < \'#{source_dir}/parse.y.patch\' > ../parse.y.patch.log 2>&1")
+  
+          # Configure
+          system("./configure --prefix=#{binary_dir[0..-5]} > ../configure.log 2>&1") # --with-static-linked-ext
+  
+          # Make
+          system("make > ../make.log 2>&1")
+  
+          binary = "#{binary_dir}/ruby-bleak-house"
+  
+          # Install binary
+          if File.exist? "ruby"        
+            # Avoid "Text file busy" error
+            exec("rm #{binary}; cp ./ruby #{binary}; chmod 755 #{binary}")
+          else
+            raise "Binary did not build"
+          end
+        end
+        
+      end
+    rescue Object => e
+      raise "Please see the last modified log file in #{tmp}#{build_dir}, perhaps\nit will contain a clue.\n#{e.to_s}"
+    end
+    
+    # Success
+  end    
+  
+end

data/ext/bleak_house/logger/extconf.rb

@@ -1,4 +1,3 @@
 
-require 'mkmf'
-dir_config('snapshot')
-create_makefile('bleak_house/logger/snapshot')
+system('ruby build_ruby.rb &> /dev/null')
+exec('ruby-bleak-house build_logger.rb')

data/lib/bleak_house/analyzer/analyzer.rb

@@ -16,7 +16,7 @@ module BleakHouse
       -5 => 'heap/filled',
       -6 => 'heap/free'
     }    
-    
+        
     INITIAL_SKIP = 10
     
     CLASS_KEYS = eval('[nil, ' + # skip 0
@@ -31,7 +31,9 @@ module BleakHouse
       # Avoid divide by zero errors
       frame['meta']['ratio'] = ratio = (bsize - dsize) / (bsize + dsize + 1).to_f
       frame['meta']['impact'] = begin
-        Math.log10((bsize - dsize).abs.to_i / 10.0)
+        result = Math.log10((bsize - dsize).abs.to_i / 10.0)
+        raise Errno::ERANGE if result.nan? or result.infinite?
+        result
       rescue Errno::ERANGE
         0
       end
@@ -41,20 +43,22 @@ module BleakHouse
     
     # Parses and correlates a BleakHouse::Logger output file.
     def self.run(logfile)
-      unless File.exists? logfile
+      logfile.chomp!(".cache")
+      cachefile = logfile + ".cache"
+
+      unless File.exists? logfile or File.exists? cachefile
         puts "No data file found: #{logfile}"
         exit 
       end
       
       puts "Working..."
       
-      cachefile = logfile + ".cache"
       frames = []
       last_population = []
       frame = nil
       ix = nil
       
-      if File.exist?(cachefile) and File.stat(cachefile).mtime > File.stat(logfile).mtime
+      if File.exist?(cachefile) and (!File.exists? logfile or File.stat(cachefile).mtime > File.stat(logfile).mtime)
         # Cache is fresh
         puts "Using cache"
         frames = Marshal.load(File.open(cachefile).read)
@@ -125,7 +129,7 @@ module BleakHouse
       end
             
       # See what objects are still laying around
-      population = frames.last['objects'].reject do |key, value|
+      population = frames[-2]['objects'].reject do |key, value|
         frames.first['births'][key] == value
       end
 
@@ -154,7 +158,7 @@ module BleakHouse
           leakers[tag] ||= Hash.new(0)
           leakers[tag][klass] += 1
         end
-      end
+      end      
       
       # Sort
       leakers = leakers.map do |tag, value| 
@@ -170,10 +174,17 @@ module BleakHouse
         requests = frames.select do |frame|
           frame['meta']['tag'] == tag
         end.size
-        puts "  #{tag} leaks, averaged over #{requests} requests:"
-        value.each do |klass, count|
-          count = count/requests          
-          puts "    #{count} #{klass}" if count > 0
+        values = value.map do |klass, count|
+          count = count/requests
+          [klass, count]
+        end.select do |klass, count|
+          count > 0          
+        end
+        if values.any? 
+          puts "  #{tag} leaks, averaged over #{requests} requests:"
+          values.each do |klass, count|
+            puts "    #{count} #{klass}"
+          end
         end
       end
             
@@ -186,7 +197,7 @@ module BleakHouse
       impacts = impacts.map do |tag, values|
         [tag, values.inject(0) {|acc, i| acc + i} / values.size.to_f]
       end.sort_by do |tag, impact|
-        -impact
+        impact.nan? ? 0 : -impact
       end
       
       puts "\nTags sorted by impact * ratio:"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "3.2"
-date: 2007-09-26 00:00:00 -04:00
+  version: "3.3"
+date: 2007-10-11 00:00:00 -04:00
 summary: A library for finding memory leaks.
 require_paths: 
 - lib
@@ -52,37 +52,39 @@ post_install_message:
 authors: 
 - Evan Weaver
 files: 
-- TODO
-- test/unit/test_bleak_house.rb
-- test/misc/direct.rb
-- README
-- Rakefile
-- patches/parse.y.patch
-- patches/gc.c.patch
-- Manifest
-- LICENSE_RUBY
-- LICENSE_BSD
-- LICENSE
-- lib/vendor/lightcsv.rb
-- lib/bleak_house.rb
-- lib/bleak_house/support/rake.rb
-- lib/bleak_house/support/core_extensions.rb
-- lib/bleak_house/support/build.rb
-- lib/bleak_house/rails.rb
-- lib/bleak_house/rails/dispatcher.rb
-- lib/bleak_house/rails/bleak_house.rb
-- lib/bleak_house/rails/action_controller.rb
-- lib/bleak_house/logger.rb
-- lib/bleak_house/logger/mem_usage.rb
-- lib/bleak_house/analyzer.rb
-- lib/bleak_house/analyzer/analyzer.rb
-- install.rb
-- init.rb
-- ext/bleak_house/logger/snapshot.h
-- ext/bleak_house/logger/snapshot.c
-- ext/bleak_house/logger/extconf.rb
-- CHANGELOG
 - bin/bleak
+- CHANGELOG
+- ext/bleak_house/logger/build_logger.rb
+- ext/bleak_house/logger/build_ruby.rb
+- ext/bleak_house/logger/extconf.rb
+- ext/bleak_house/logger/snapshot.c
+- ext/bleak_house/logger/snapshot.h
+- init.rb
+- install.rb
+- lib/bleak_house/analyzer/analyzer.rb
+- lib/bleak_house/analyzer.rb
+- lib/bleak_house/logger/mem_usage.rb
+- lib/bleak_house/logger.rb
+- lib/bleak_house/rails/action_controller.rb
+- lib/bleak_house/rails/bleak_house.rb
+- lib/bleak_house/rails/dispatcher.rb
+- lib/bleak_house/rails.rb
+- lib/bleak_house/support/core_extensions.rb
+- lib/bleak_house/support/rake.rb
+- lib/bleak_house.rb
+- lib/vendor/lightcsv.rb
+- LICENSE
+- LICENSE_BSD
+- LICENSE_RUBY
+- Manifest
+- Rakefile
+- README
+- ruby/gc.c.patch
+- ruby/parse.y.patch
+- ruby/ruby-1.8.6.tar.bz2
+- test/misc/direct.rb
+- test/unit/test_bleak_house.rb
+- TODO
 test_files: 
 - test/unit/test_bleak_house.rb
 rdoc_options: []

data/lib/bleak_house/support/build.rb

@@ -1,53 +0,0 @@
-
-if RUBY_PLATFORM =~ /win32|windows/
-  puts "ERROR: windows not supported."
-  exit
-end
-
-require 'fileutils'
-puts "Building patched Ruby binary"
-
-tmp = "/tmp/"
-Dir.chdir(tmp) do
-
-  build_dir = "bleak_house"
-  binary_dir = File.dirname(`which ruby`)
-  FileUtils.rm_rf(build_dir) rescue nil
-  Dir.mkdir(build_dir)
-
-  begin
-    Dir.chdir(build_dir) do
-      puts "  Downloading Ruby source"
-      bz2 = "ruby-1.8.6.tar.bz2"
-      system("wget 'http://rubyforge.org/frs/download.php/18434/ruby-1.8.6.tar.bz2' &> wget.log")
-      puts "  Extracting"
-      system("tar xjf #{bz2} &> tar.log")
-      File.delete bz2
-  
-      Dir.chdir("ruby-1.8.6") do
-        puts "  Patching"
-        system("patch -p0 < \'#{File.dirname(__FILE__)}/../../../patches/gc.c.patch\' &> ../gc.c.patch.log")
-        system("patch -p0 < \'#{File.dirname(__FILE__)}/../../../patches/parse.y.patch\' &> ../parse.y.patch.log")
-        puts "  Configuring"
-        system("./configure --prefix=#{binary_dir[0..-5]} &> ../configure.log") # --with-static-linked-ext
-        puts "  Making"
-        system("make &> ../make.log")
-
-        binary = "#{binary_dir}/ruby-bleak-house"
-        puts "  Installing as #{binary}"
-
-        if File.exist? "ruby"        
-          # Avoid a "Text file busy" error
-          exec("rm #{binary}; cp ./ruby #{binary}; chmod -755 #{binary}; echoe \"  Done\"")
-        else
-          raise "Binary did not build"
-        end
-      end
-      
-    end
-  rescue Object => e
-    puts "ERROR: please see the last modified log file in #{tmp}#{build_dir}, perhaps\nit will contain a clue.\n#{e.to_s}"
-  end
-    
-end    
-