bleak_house 3.4 → 3.5

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v3.5. Explain when you need more frames. Use a cross-platform version of 'which'. Slight accuracy improvement.
+
 v3.4. Clearer output descriptions; work around a Marshal bug on x64; fix for missing immortal leaks.
 
 v3.3. Build Ruby in gem install step; bundle Ruby 1.8.6 source; fixes for truncated final frames.

data/Manifest

@@ -20,7 +20,6 @@ lib/bleak_house/support/rake.rb
 lib/bleak_house.rb
 LICENSE
 LICENSE_BSD
-LICENSE_RUBY
 Manifest
 Rakefile
 README

data/README

@@ -5,7 +5,7 @@ A library for finding memory leaks.
 
 == License
 
-Copyright 2007 Cloudburst, LLC. See the included LICENSE file. Portions copyright 2006 Eric Hodel and used with permission. See the included LICENSE_BSD file. Portions copyright 2007 TOMITA Masahiro and used with permission. See the included LICENSE_RUBY file.
+Copyright 2007 Cloudburst, LLC. See the included LICENSE file. Portions copyright 2006 Eric Hodel and used with permission. See the included LICENSE_BSD file. 
 
 The public certificate for this gem is at http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem.
 

data/ext/bleak_house/logger/build_ruby.rb

@@ -1,4 +1,6 @@
 
+# Extension abuse in order to build our patched binary as part of the gem install process.
+
 if RUBY_PLATFORM =~ /win32|windows/
   raise "Windows is not supported."
 end
@@ -8,7 +10,15 @@ tmp = "/tmp/"
 
 require 'fileutils'
 
-if `which ruby-bleak-house` =~ /no ruby-bleak-house in/
+def which(basename)
+  # system('which') is not compatible across Linux and BSD
+  ENV['PATH'].split(File::PATH_SEPARATOR).detect do |directory|
+    path = File.join(directory, basename.to_s)
+    path if File.exist? path
+  end
+end
+  
+unless which('ruby-bleak-house')
   
   Dir.chdir(tmp) do
     build_dir = "bleak_house"
@@ -29,14 +39,10 @@ if `which ruby-bleak-house` =~ /no ruby-bleak-house in/
     
         Dir.chdir("ruby-1.8.6") do
   
-          # Patch
+          # Patch, configure, and build
           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"
@@ -44,7 +50,8 @@ if `which ruby-bleak-house` =~ /no ruby-bleak-house in/
           # Install binary
           if File.exist? "ruby"        
             # Avoid "Text file busy" error
-            exec("rm #{binary}; cp ./ruby #{binary}; chmod 755 #{binary}")
+            File.delete binary if File.exist? binary
+            exec("cp ./ruby #{binary}; chmod 755 #{binary}")
           else
             raise "Binary did not build"
           end
@@ -58,4 +65,4 @@ if `which ruby-bleak-house` =~ /no ruby-bleak-house in/
     # Success
   end    
   
-end
+end

data/lib/bleak_house/analyzer/analyzer.rb

@@ -23,6 +23,15 @@ module BleakHouse
       open(
         File.dirname(__FILE__) + '/../../../ext/bleak_house/logger/snapshot.h'
       ).read[/\{(.*?)\}/m, 1] + ']')
+
+    def self.backwards_detect(array)
+      i = array.size - 1
+      while i >= 0
+        item = array[i]
+        return item if yield(item)
+        i -= 1
+      end
+    end   
     
     def self.calculate!(frame, index, total, obj_count = nil)
       bsize = frame['births'].size
@@ -70,8 +79,13 @@ module BleakHouse
       else                        
         # Rebuild frames
         total_frames = `grep '^-1' #{logfile} | wc`.to_i - 2
-        
+                
         puts "#{total_frames} frames"     
+
+        if total_frames < INITIAL_SKIP * 3
+          puts "Not enough frames for accurate results. Please record at least #{INITIAL_SKIP * 3} frames."
+          exit!
+        end
         
         Ccsv.foreach(logfile) do |row|                
         
@@ -121,7 +135,7 @@ module BleakHouse
         end
         
         frames = frames[0..-2]       
-        frames.last['objects'] = frames.last['objects'].to_a # Work around a Marshal bug
+        frames.last['objects'] = frames.last['objects'].to_a # Work around a Marshal bug x86-64
         
         # Cache the result
         File.open(cachefile, 'w') do |f|
@@ -130,14 +144,24 @@ module BleakHouse
         
       end
       
+      puts "\nRehashing."
+      
       # Convert births back to hashes, necessary due to the Marshal workaround    
       frames.each do |frame|
-        frame['births'] = Hash[*frame['births'].flatten]
+        frame['births_hash'] = {}
+        frame['births'].each do |key, value|
+          frame['births_hash'][key] = value
+        end
+        frame.delete('births')
       end
+
+#      require 'ruby-debug'; Debugger.start
+#      
+#      debugger
                              
       # See what objects are still laying around
       population = frames.last['objects'].reject do |key, value|
-        frames.first['births'][key] == value
+        frames.first['births_hash'][key] == value
       end
 
       puts "\n#{frames.size - 1} full frames. Removing #{INITIAL_SKIP} frames from each end of the run to account for\nstartup overhead and GC lag."
@@ -146,7 +170,7 @@ module BleakHouse
       frames = frames[INITIAL_SKIP..-INITIAL_SKIP]
       
       total_births = frames.inject(0) do |births, frame|
-        births + frame['births'].size
+        births + frame['births_hash'].size
       end
       total_deaths = frames.inject(0) do |deaths, frame|
         deaths + frame['deaths'].size
@@ -155,13 +179,16 @@ module BleakHouse
       puts "\n#{total_births} total births, #{total_deaths} total deaths, #{population.size} uncollected objects."
       
       leakers = {}
-            
+      
+#      debugger
+      
       # Find the sources of the leftover objects in the final population
       population.each do |id, klass|
-        leaker = frames.detect do |frame|
-          frame['births'][id] == klass
+        leaker = backwards_detect(frames) do |frame|
+          frame['births_hash'][id] == klass
         end
         if leaker
+#          debugger
           tag = leaker['meta']['tag']
           klass = CLASS_KEYS[klass] if klass.is_a? Fixnum
           leakers[tag] ||= Hash.new(0)
@@ -211,9 +238,10 @@ module BleakHouse
       impacts.each do |tag, total|
         puts "  #{format('%.4f', total).rjust(7)}: #{tag}"
       end
-    end
-    
-    puts "\nDone"
+
+      puts "\nDone"
+
+    end    
     
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "3.4"
-date: 2007-10-31 00:00:00 -04:00
+  version: "3.5"
+date: 2007-11-14 00:00:00 -05:00
 summary: A library for finding memory leaks.
 require_paths: 
 - lib
@@ -80,7 +80,6 @@ files:
 - lib/bleak_house.rb
 - LICENSE
 - LICENSE_BSD
-- LICENSE_RUBY
 - Manifest
 - Rakefile
 - README

data/LICENSE_RUBY

@@ -1,53 +0,0 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
-Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
-$B$-$^$9!%(BGPL$B$K$D$$$F$O(BCOPYING.txt$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
-
-  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
-
-  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
-     $B<+M3$KJQ99$G$-$^$9!%(B
-
-     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
-         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
-
-     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
-         $B;H$&!%(B
-
-     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
-         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
-         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
-         $B%9$NF~<jK!$rL@<($9$k!%(B
-
-     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
-
-  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
-     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
-
-     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
-         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
-
-     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
-
-     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
-         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
-
-     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
-
-  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
-     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
-     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$k>l9g$,$"$j$^$9!%(B
-
-     $B6qBNE*$K$O(Bgc.c($B0lIt(B)$B!$(Butil.c($B0lIt(B)$B!$(Bst.[ch]$B!$(Bregex.[ch] 
-     $B$*$h$S(B ./missing$B%G%#%l%/%H%j2<$N%U%!%$%k72$,3:Ev$7$^$9!%(B
-     $B$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O3F%U%!%$%k$r;2>H$7$F$/(B
-     $B$@$5$$!%(B
-
-  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
-     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
-     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
-     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
-
-  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
-     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
-     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
-     $BG$$r;}$A$^$;$s!%(B