bleak_house 4.1.1 → 4.2

data/CHANGELOG

@@ -1,5 +1,7 @@
 
-v4.1.1. Update bundled Ruby to patchlevel 230. 
+v4.2. Harden patch/build process. Fix bug.
+
+v4.1.1. Update bundled Ruby to patchlevel 230.
 
 v4.1. Support calculating deltas in analyze utility.
 

data/Manifest

@@ -11,10 +11,10 @@ lib/bleak_house.rb
 LICENSE
 LICENSE_BSD
 Manifest
+Rakefile
 README
-ruby/configure.patch
-ruby/gc.patch
-ruby/ruby-1.8.6-p230.tar.bz2
+ruby/ruby-1.8.6-p286.tar.bz2
+ruby/ruby.patch
 ruby/valgrind.patch
 test/benchmark/bench.rb
 test/test_helper.rb

data/README

@@ -1,13 +1,13 @@
 
 BleakHouse
 
-A library for finding memory leaks. 
+A library for finding memory leaks.
 
 == License
 
-Copyright 2007, 2008 Cloudburst, LLC. Licensed under the AFL 3. See the included LICENSE file. Portions copyright 2006 Eric Hodel and used with permission. See the included LICENSE_BSD file. 
+Copyright 2007, 2008 Cloudburst, LLC. Licensed under the AFL 3. 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 here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
+The public certificate for this gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem].
 
 If you use this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
 
@@ -43,10 +43,10 @@ First, to setup the app for profiling, add the following at the bottom of <tt>co
   require 'bleak_house' if ENV['BLEAK_HOUSE']
 
 Then, to engage the logger (possibly in a live deployment situation), start a server instance as so:
-  RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server 
+  RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server
 
 Look for the message:
-  ** Bleakhouse: installed  
+  ** Bleakhouse: installed
 
 Exercise your app. After a couple hundred requests, hit CTRL-C. The server will stop and BleakHouse will produce a dumpfile in <tt>/tmp</tt>:
 
@@ -68,10 +68,10 @@ To analyze it, just run the listed command. The top 20 leakiest lines will be li
    935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
    834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
   ...
-  
+
 You can pass an integer as the second parameter to <tt>bleak</tt> if you want to see more lines than the default.
 
-The underscored types are special Ruby internal structs, but can be real leaks just as easily as fullblown classes. 
+The underscored types are special Ruby internal structs, but can be real leaks just as easily as fullblown classes.
 
 = Extras
 
@@ -95,11 +95,11 @@ If BleakHouse doesn't report any heap growth but you still have memory growth, y
 
 == Methods
 
-The easiest way to fix a leak is to make it repeatable. 
+The easiest way to fix a leak is to make it repeatable.
 
 First, write a script that exercises your app in a deterministic way. Run it for a small number of loops; then run <tt>bleak</tt>. Then run it for a larger number of loops, and run <tt>bleak</tt> again. The lines that grow significantly between runs are your leaks for that codepath.
 
-Now, look at those lines in the source and try to figure out what references them. Where do the return values go? Add some breakpoints or output backtraces to <tt>STDERR</tt> as you go. Eventually you should find a point where it is relatively clear that a reference is getting maintained. 
+Now, look at those lines in the source and try to figure out what references them. Where do the return values go? Add some breakpoints or output backtraces to <tt>STDERR</tt> as you go. Eventually you should find a point where it is relatively clear that a reference is getting maintained.
 
 Try to remove that reference, run your script again, and see if the object counts have dropped.
 

data/Rakefile

@@ -2,11 +2,11 @@
 require 'echoe'
 
 Echoe.new("bleak_house") do |p|
-  p.author = "Evan Weaver" 
+  p.author = "Evan Weaver"
   p.project = "fauna"
-  p.summary = "A library for finding memory leaks."  
-  p.url = "http://blog.evanweaver.com/files/doc/fauna/bleak_house/"  
+  p.summary = "A library for finding memory leaks."
+  p.url = "http://blog.evanweaver.com/files/doc/fauna/bleak_house/"
   p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/'
-  p.require_signed = true  
+  p.require_signed = true
   p.rdoc_pattern = /^ext.*\.c|lib.*|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
 end

data/TODO

@@ -1,4 +1,6 @@
 
+* Figure out why Rubygems 1.2.0 is a hard requirement
+
 * Override Kernel#eval to always include sourceline macros.
 * Mimic Valgrind's output format as much as possible
 * Log remaining heap reference traces

data/bleak_house.gemspec

@@ -1,101 +1,40 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Bleak_house-4.1.1
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{bleak_house}
+  s.version = "4.2"
 
---- !ruby/object:Gem::Specification 
-name: bleak_house
-version: !ruby/object:Gem::Version 
-  version: 4.1.1
-platform: ruby
-authors: 
-- Evan Weaver
-autorequire: 
-bindir: bin
-date: 2008-06-22 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: A library for finding memory leaks.
-email: ""
-executables: 
-- bleak
-extensions: 
-- ext/extconf.rb
-extra_rdoc_files: 
-- CHANGELOG
-- ext/snapshot.c
-- lib/bleak_house/analyzer.rb
-- lib/bleak_house/hook.rb
-- lib/bleak_house.rb
-- LICENSE
-- LICENSE_BSD
-- README
-- TODO
-files: 
-- bin/bleak
-- CHANGELOG
-- ext/build_ruby.rb
-- ext/build_snapshot.rb
-- ext/extconf.rb
-- ext/snapshot.c
-- ext/snapshot.h
-- lib/bleak_house/analyzer.rb
-- lib/bleak_house/hook.rb
-- lib/bleak_house.rb
-- LICENSE
-- LICENSE_BSD
-- Manifest
-- README
-- ruby/configure.patch
-- ruby/gc.patch
-- ruby/ruby-1.8.6-p230.tar.bz2
-- ruby/valgrind.patch
-- test/benchmark/bench.rb
-- test/test_helper.rb
-- test/unit/test_bleak_house.rb
-- TODO
-- bleak_house.gemspec
-- Rakefile
-has_rdoc: true
-homepage: http://blog.evanweaver.com/files/doc/fauna/bleak_house/
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Bleak_house
-- --main
-- README
-require_paths: 
-- lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - "="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Evan Weaver"]
+  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
+  s.date = %q{2009-02-20}
+  s.default_executable = %q{bleak}
+  s.description = %q{A library for finding memory leaks.}
+  s.email = %q{}
+  s.executables = ["bleak"]
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "ext/snapshot.c", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "lib/bleak_house.rb", "LICENSE", "LICENSE_BSD", "README", "TODO"]
+  s.files = ["bin/bleak", "CHANGELOG", "ext/build_ruby.rb", "ext/build_snapshot.rb", "ext/extconf.rb", "ext/snapshot.c", "ext/snapshot.h", "lib/bleak_house/analyzer.rb", "lib/bleak_house/hook.rb", "lib/bleak_house.rb", "LICENSE", "LICENSE_BSD", "Manifest", "Rakefile", "README", "ruby/ruby-1.8.6-p286.tar.bz2", "ruby/ruby.patch", "ruby/valgrind.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "TODO", "bleak_house.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/bleak_house/}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bleak_house", "--main", "README"]
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{fauna}
+  s.rubygems_version = %q{1.3.1}
+  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
+  s.summary = %q{A library for finding memory leaks.}
+  s.test_files = ["test/test_helper.rb", "test/unit/test_bleak_house.rb"]
 
-rubyforge_project: fauna
-rubygems_version: 1.2.0
-specification_version: 2
-summary: A library for finding memory leaks.
-test_files: 
-- test/test_helper.rb
-- test/unit/test_bleak_house.rb
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/ext/build_ruby.rb

@@ -15,58 +15,63 @@ tmp = "/tmp/"
 require 'fileutils'
 require 'rbconfig'
 
+def execute(command)    
+  unless system(command)
+    puts "Failed: #{command.inspect}"
+    exit -1 
+  end
+end
+
 def which(basename)
-  # system('which') is not compatible across Linux and BSD
+  # execute('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
 
-if which('ruby-bleak-house') and 
-  `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i >= 902
-  # OK
+if which('ruby-bleak-house') and
+  (patchlevel  = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 903
+  puts "Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})"
 else
-  # Build  
+  # Build
   Dir.chdir(tmp) do
     build_dir = "bleak_house"
     binary_dir = File.dirname(`which ruby`)
-    
+
     FileUtils.rm_rf(build_dir) rescue nil
     if File.exist? build_dir
       raise "Could not delete previous build dir #{Dir.pwd}/#{build_dir}"
     end
-    
+
     Dir.mkdir(build_dir)
-  
+
     begin
       Dir.chdir(build_dir) do
-  
-        # Copy Ruby source
-        bz2 = "ruby-1.8.6-p230.tar.bz2"
+
+        puts "Copy Ruby source"
+        bz2 = "ruby-1.8.6-p286.tar.bz2"
         FileUtils.copy "#{source_dir}/#{bz2}", bz2
-  
-        # Extract
-        system("tar xjf #{bz2} > tar.log 2>&1")
+
+        puts "Extract"
+        execute("tar xjf #{bz2}")
         File.delete bz2
-    
-        Dir.chdir("ruby-1.8.6-p230") do
-  
-          # Patch, configure, and build
-          ["valgrind", "configure", "gc"].each do |patch|
-            system("patch -p0 < \'#{source_dir}/#{patch}.patch\' > ../#{patch}_patch.log 2>&1")
-          end
- 
-          system("./configure --prefix=#{binary_dir[0..-5]} > ../configure.log 2>&1") # --with-static-linked-ext
-          
-          # Patch the makefile for arch/sitedir
+
+        Dir.chdir("ruby-1.8.6-p286") do
+
+          puts "Patch, configure, and build"
+          execute("patch -p0 < \'#{source_dir}/ruby.patch\'")
+
+          execute("./configure --prefix=#{binary_dir[0..-5]}") # --with-static-linked-ext
+
+          puts "Patch the makefile for arch/sitedir"
           makefile = File.read('Makefile')
           %w{arch sitearch sitedir}.each do | key |
             makefile.gsub!(/#{key} = .*/, "#{key} = #{Config::CONFIG[key]}")
           end
           File.open('Makefile', 'w'){|f| f.puts(makefile)}
-          
-          # Patch the config.h for constants
+
+          puts "Patch the config.h for constants"
           constants = {
             'RUBY_LIB' => 'rubylibdir',          #define RUBY_LIB "/usr/lib/ruby/1.8"
             'RUBY_SITE_LIB' => 'sitedir',        #define RUBY_SITE_LIB "/usr/lib/ruby/site_ruby"
@@ -80,27 +85,25 @@ else
             config_h.gsub!(/#define #{const} .*/, "#define #{const} \"#{Config::CONFIG[key]}\"")
           end
           File.open('config.h', 'w'){|f| f.puts(config_h)}
-          
-          system("make > ../make.log 2>&1")
-  
+
+          execute("make")
+
           binary = "#{binary_dir}/ruby-bleak-house"
-  
-          # Install binary
-          if File.exist? "ruby"        
+
+          puts "Install binary"
+          if File.exist? "ruby"
             # Avoid "Text file busy" error
             File.delete binary if File.exist? binary
             exec("cp ./ruby #{binary}; chmod 755 #{binary}")
           else
-            raise "Binary did not build"
+            raise
           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    
-  
+
+    puts "Success"
+  end
+
 end

data/ext/extconf.rb

@@ -1,3 +1,26 @@
+require 'fileutils'
 
-system('ruby build_ruby.rb &> /dev/null')
-exec('ruby-bleak-house build_snapshot.rb')
+module BleakHouse
+
+  LOGDIR = File.expand_path('../../log', __FILE__)
+  LOGFILE = File.join(LOGDIR, 'bleak_house.log')
+  
+  FileUtils.mkdir_p(LOGDIR)
+  
+  def self.write_to_log(message)
+    File.open(LOGFILE, 'a') { |f| f.puts message }
+  end
+
+  def self.execute(command)    
+    unless system(command)
+      puts File.open(LOGFILE).read
+      exit -1 
+    end
+  end
+end
+
+BleakHouse.write_to_log('-%{ BUILDING RUBY }%-')
+BleakHouse.execute("ruby build_ruby.rb >> #{BleakHouse::LOGFILE} 2>&1")
+
+BleakHouse.write_to_log('-%{ BUILDING SNAPSHOT }%-')
+BleakHouse.execute("ruby-bleak-house build_snapshot.rb >> #{BleakHouse::LOGFILE} 2>&1")

data/ext/snapshot.c

@@ -19,8 +19,8 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
   Check_Type(_logfile, T_STRING);
 
   RVALUE *obj, *obj_end;
-  st_table_entry *sym; 
-  
+  st_table_entry *sym;
+
   struct heaps_slot * heaps = rb_gc_heap_slots();
   struct st_table * sym_tbl = rb_parse_sym_tbl();
 
@@ -37,15 +37,15 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
   int filled_slots = 0;
   int free_slots = 0;
 
-  int i; 
+  int i;
   char * chr;
-    
+
   for (i = 0; i < 3; i++) {
     /* request GC run */
     rb_funcall(rb_mGC, rb_intern("start"), 0);
     rb_thread_schedule();
   }
-  
+
   /* walk the heap */
   for (i = 0; i < rb_gc_heaps_used(); i++) {
     obj = heaps[i].slot;
@@ -53,27 +53,27 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
     for (; obj < obj_end; obj++) {
       if (obj->as.basic.flags) { /* always 0 for freed objects */
         filled_slots ++;
-        
+
         /* write the source file*/
         if (obj->file) {
-          chr = obj->file;          
+          chr = obj->file;
           if (*chr != '\0') {
             fprintf(logfile, "%s", obj->file);
           } else {
-            fprintf(logfile, "__empty__");   
+            fprintf(logfile, "__empty__");
           }
         } else {
           fprintf(logfile, "__null__");
         }
-        
+
         /* write the source line */
-        fprintf(logfile, ":");        
+        fprintf(logfile, ":");
         if (obj->line) {
           fprintf(logfile, "%i", obj->line);
         } else {
           fprintf(logfile, "__null__");
         }
-        
+
         /* write the class */
         fprintf(logfile, ":");
         switch (TYPE(obj)) {
@@ -96,7 +96,7 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
               fprintf(logfile, rb_obj_classname((VALUE)obj));
             }
         }
-        
+
         /* write newline */
         fprintf(logfile, "\n");
       } else {
@@ -104,30 +104,30 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
       }
     }
   }
-  
-  /* walk the symbol table */  
+
+  /* walk the symbol table */
   /* hashed = lookup_builtin("Symbol");
   for (i = 0; i < sym_tbl->num_bins; i++) {
     for (sym = sym_tbl->bins[i]; sym != 0; sym = sym->next) {
       fprintf(logfile, "%i,%lu\n", hashed + 1, sym->record);
     }
   } */
-    
+
   fprintf(logfile, "%i filled\n", filled_slots);
   fprintf(logfile, "%i free\n", free_slots);
   fclose(logfile);
-  
+
   return Qnil;
 }
 
 
 /*
 
-This class performs the actual object logging of BleakHouse. To use it directly, you need to make calls to BleakHouse.snapshot. 
+This class performs the actual object logging of BleakHouse. To use it directly, you need to make calls to BleakHouse.snapshot.
 
-By default, BleakHouse records a snapshot on exit. You can disable this by setting the environment variable <tt>NO_EXIT_HANDLER</tt> before startup. 
+By default, BleakHouse records a snapshot on exit. You can disable this by setting the environment variable <tt>NO_EXIT_HANDLER</tt> before startup.
 
-It is also possible to externally trigger the snapshot at any time by sending <tt>SIGUSR2</tt> to the process. 
+It is also possible to externally trigger the snapshot at any time by sending <tt>SIGUSR2</tt> to the process.
 
 == Example
 
@@ -138,7 +138,7 @@ At the start of your app, put:
 
 Run your app. Once it exits, analyze your data:
   bleak /path/to/logfile
-  
+
 */
 void
 Init_snapshot()

data/ext/snapshot.h

@@ -31,7 +31,7 @@ typedef struct RVALUE {
         struct SCOPE   scope;
     } as;
     char *file;
-    int   line;    
+    int   line;
 } RVALUE;
 
 struct heaps_slot {

data/lib/bleak_house/analyzer.rb

@@ -7,31 +7,31 @@ module BleakHouse
       lines = args.last[/^\d+$/] ? args.pop.to_i : 20
 
       raise "Can't diff more than 2 files" if args.size > 2
-      
-      outputs = args.map do |file|          
+
+      outputs = args.map do |file|
         filled, free = `tail -n 2 #{file}`.split("\n")
         unless filled =~ /filled/ and free =~ /free/
           raise "#{file} is incomplete or corrupted"
         end
-  
-        length = `wc #{file}`.to_i - 2      
-        cmd = ENV['NO_TRACE'] ? "awk -F: '{print $3}' " + file : "cat #{file}"      
+
+        length = `wc #{file}`.to_i - 2
+        cmd = ENV['NO_TRACE'] ? "awk -F: '{print $3}' " + file : "cat #{file}"
         cmd += " | sort | uniq -c | sort -nr | head -#{lines}"
-  
+
         ["#{length} total objects", "#{filled} heap slots", "#{free} heap slots"] + `#{cmd}`.split("\n")
       end
-    
+
       if outputs.size == 1
         # Just output the data
-        puts "Displaying top #{lines} most common line/class pairs"        
+        puts "Displaying top #{lines} most common line/class pairs"
         puts outputs.first
       else
-        puts "Displaying change in top #{lines} most common line/class pairs"        
+        puts "Displaying change in top #{lines} most common line/class pairs"
         puts diff(outputs)
       end
 
     end
-    
+
     def self.diff(outputs)
       # Calculate the diff
       diff = Hash.new(0)
@@ -47,8 +47,8 @@ module BleakHouse
         -value
       end.map do |key, value|
         "#{value.to_s.rjust(6)} #{key}"
-      end    
+      end
     end
-    
+
   end
 end

data/lib/bleak_house/hook.rb

@@ -6,7 +6,7 @@ module BleakHouse
     filename = "/tmp/bleak.#{Process.pid}.#{@count}.dump"
     STDERR.puts "** BleakHouse: working..."
     BleakHouse.snapshot(filename)
-    STDERR.puts "** BleakHouse: complete\n** Bleakhouse: Run 'bleak #{filename}' to analyze."  
+    STDERR.puts "** BleakHouse: complete\n** Bleakhouse: Run 'bleak #{filename}' to analyze."
     @count += 1
   end
 end
@@ -20,6 +20,4 @@ end
 
 Kernel.trap("USR2") do
   BleakHouse.hook
-end
-
-
+end

data/ruby/{configure.patch → ruby.patch}

@@ -1,7 +1,18 @@
-Index: configure
-===================================================================
---- configure	(revision 6446)
-+++ configure	(working copy)
+diff -u Makefile.in Makefile.in
+--- Makefile.in	2009-02-20 17:55:35.000000000 -0800
++++ Makefile.in	2009-02-20 18:06:52.000000000 -0800
+@@ -34,7 +34,7 @@
+ 
+ empty =
+ OUTFLAG = @OUTFLAG@$(empty)
+-CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
++CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@ @VALGRIND_CFLAGS@
+ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
+ EXTLDFLAGS = 
+diff -u configure configure
+--- configure	2009-02-20 17:55:33.000000000 -0800
++++ configure	2009-02-20 18:06:58.000000000 -0800
 @@ -720,6 +720,7 @@
  ARCHFILE
  RDOCTARGET
@@ -18,7 +29,7 @@ Index: configure
    --disable-rpath         embed run path into extension libraries.
    --enable-shared         build a shared library for Ruby.
    --enable-install-doc    build and install rdoc indexes during install
-@@ -12988,13 +12990,11 @@
+@@ -12990,13 +12992,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -34,7 +45,7 @@ Index: configure
    ;
    return 0;
  }
-@@ -13034,13 +13034,11 @@
+@@ -13036,13 +13036,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
@@ -50,7 +61,7 @@ Index: configure
    ;
    return 0;
  }
-@@ -15768,6 +15766,172 @@
+@@ -16306,6 +16304,172 @@
      fi
  fi
  
@@ -223,7 +234,7 @@ Index: configure
  DEFAULT_KCODE="KCODE_NONE"
  
  
-@@ -17854,6 +18018,7 @@
+@@ -18386,6 +18550,7 @@
  ARCHFILE!$ARCHFILE$ac_delim
  RDOCTARGET!$RDOCTARGET$ac_delim
  XCFLAGS!$XCFLAGS$ac_delim
@@ -231,7 +242,7 @@ Index: configure
  XLDFLAGS!$XLDFLAGS$ac_delim
  LIBRUBY_LDSHARED!$LIBRUBY_LDSHARED$ac_delim
  LIBRUBY_DLDFLAGS!$LIBRUBY_DLDFLAGS$ac_delim
-@@ -17887,7 +18052,7 @@
+@@ -18419,7 +18584,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -240,3 +251,214 @@ Index: configure
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -u configure.in configure.in
+--- configure.in	2009-02-20 17:55:33.000000000 -0800
++++ configure.in	2009-02-20 18:06:52.000000000 -0800
+@@ -956,6 +956,22 @@
+     fi
+ fi
+ 
++AC_ARG_ENABLE(valgrind,
++       [  --enable-valgrind       use valgrind support],
++       [want_valgrind=$enableval], [want_valgrind=auto])
++
++if test x"$want_valgrind" != xno; then
++  AC_CHECK_HEADERS(valgrind/memcheck.h, have_valgrind=yes, have_valgrind=no)
++	if test x"$have_valgrind" = xyes; then
++		AC_DEFINE(HAVE_VALGRIND)
++		VALGRIND_CFLAGS="";
++	elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then
++		AC_MSG_ERROR(valgrind support requested but valgrind not found)
++	else
++	  VALGRIND_CFLAGS="";
++	fi
++fi
++
+ dnl default value for $KANJI
+ DEFAULT_KCODE="KCODE_NONE"
+ 
+@@ -1565,6 +1581,7 @@
+ 
+ CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+ AC_SUBST(XCFLAGS)dnl
++AC_SUBST(VALGRIND_CFLAGS)dnl
+ AC_SUBST(XLDFLAGS)dnl
+ AC_SUBST(LIBRUBY_LDSHARED)
+ AC_SUBST(LIBRUBY_DLDFLAGS)
+diff -u eval.c eval.c
+--- eval.c	2009-02-20 17:55:33.000000000 -0800
++++ eval.c	2009-02-20 18:06:52.000000000 -0800
+@@ -28,6 +28,12 @@
+ #define EXIT_FAILURE 1
+ #endif
+ 
++#ifdef HAVE_VALGRIND
++#include <valgrind/memcheck.h>
++#else
++#define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
++#endif
++
+ #include <stdio.h>
+ 
+ #include "st.h"
+@@ -5256,6 +5262,9 @@
+     int pcall;
+ {
+     ruby_current_node = lhs;
++
++    VALGRIND_MAKE_MEM_DEFINED(&val, sizeof(val));
++
+     if (val == Qundef) {
+ 	rb_warning("assigning void value");
+ 	val = Qnil;
+diff -u gc.c gc.c
+--- gc.c	2009-02-20 17:55:35.000000000 -0800
++++ gc.c	2009-02-20 18:10:38.000000000 -0800
+@@ -30,6 +30,12 @@
+ #include <sys/resource.h>
+ #endif
+ 
++#ifdef HAVE_VALGRIND
++#include <valgrind/memcheck.h>
++#else
++#define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
++#endif
++
+ #if defined _WIN32 || defined __CYGWIN__
+ #include <windows.h>
+ #endif
+@@ -99,6 +105,9 @@
+ {
+     void *mem;
+ 
++    VALGRIND_MAKE_MEM_DEFINED(&malloc_increase, sizeof(malloc_increase));
++    VALGRIND_MAKE_MEM_DEFINED(&malloc_limit, sizeof(malloc_limit));
++
+     if (size < 0) {
+ 	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
+     }
+@@ -257,8 +266,6 @@
+     }
+ }
+ 
+-#undef GC_DEBUG
+-
+ void
+ rb_global_variable(var)
+     VALUE *var;
+@@ -293,10 +300,8 @@
+ 	struct RVarmap varmap;
+ 	struct SCOPE   scope;
+     } as;
+-#ifdef GC_DEBUG
+     char *file;
+     int   line;
+-#endif
+ } RVALUE;
+ 
+ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+@@ -315,6 +320,22 @@
+ static int heaps_length = 0;
+ static int heaps_used   = 0;
+ 
++struct heaps_slot *
++rb_gc_heap_slots()
++{
++    return heaps;
++}
++
++int
++rb_gc_heaps_used() {
++    return heaps_used;
++}
++
++int
++rb_gc_heaps_length() {
++    return heaps_length;
++}
++
+ #define HEAP_MIN_SLOTS 10000
+ static int heap_slots = HEAP_MIN_SLOTS;
+ 
+@@ -402,6 +423,11 @@
+     RANY(obj)->file = ruby_sourcefile;
+     RANY(obj)->line = ruby_sourceline;
+ #endif
++    if (ruby_current_node && ruby_current_node->nd_file) {
++      RANY(obj)->file = ruby_current_node->nd_file;
++      RANY(obj)->line = nd_line(ruby_current_node);
++    }
++
+     return obj;
+ }
+ 
+@@ -638,6 +664,9 @@
+     register long n;
+ {
+     VALUE v;
++
++    VALGRIND_MAKE_MEM_DEFINED(x, sizeof(*x) * n);
++
+     while (n--) {
+         v = *x;
+ 	if (is_pointer_to_heap((void *)v)) {
+@@ -728,11 +757,17 @@
+ {
+     register RVALUE *obj;
+ 
++    VALGRIND_MAKE_MEM_DEFINED(&ptr, sizeof(ptr));
+     obj = RANY(ptr);
++    VALGRIND_MAKE_MEM_DEFINED(obj, sizeof(*obj));
++
+     if (rb_special_const_p(ptr)) return; /* special const not marked */
+     if (obj->as.basic.flags == 0) return;       /* free cell */
+     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
++
+     obj->as.basic.flags |= FL_MARK;
++    /* mark our new reference point for sourcefile objects */
++    mark_source_filename(RANY(obj)->file);
+ 
+     if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
+ 	if (!mark_stack_overflow) {
+diff -u parse.c parse.c
+--- parse.c	2009-02-20 17:55:35.000000000 -0800
++++ parse.c	2009-02-20 18:07:07.000000000 -0800
+@@ -11180,6 +11180,11 @@
+  *                                     :wait2, :$>]
+  */
+ 
++struct st_table *
++rb_parse_sym_tbl() {
++  return sym_tbl;
++}
++
+ VALUE
+ rb_sym_all_symbols()
+ {
+diff -u parse.y parse.y
+--- parse.y	2009-02-20 17:55:35.000000000 -0800
++++ parse.y	2009-02-20 18:07:07.000000000 -0800
+@@ -6191,6 +6191,11 @@
+  *                                     :wait2, :$>]
+  */
+ 
++struct st_table *
++rb_parse_sym_tbl() {
++  return sym_tbl;
++}
++
+ VALUE
+ rb_sym_all_symbols()
+ {
+diff -u version.h version.h
+--- version.h	2009-02-20 17:55:36.000000000 -0800
++++ version.h	2009-02-20 18:07:51.000000000 -0800
+@@ -2,7 +2,7 @@
+ #define RUBY_RELEASE_DATE "2008-08-08"
+ #define RUBY_VERSION_CODE 186
+ #define RUBY_RELEASE_CODE 20080808
+-#define RUBY_PATCHLEVEL 286
++#define RUBY_PATCHLEVEL 903
+ 
+ #define RUBY_VERSION_MAJOR 1
+ #define RUBY_VERSION_MINOR 8

data/ruby/valgrind.patch

@@ -3,14 +3,14 @@ Index: Makefile.in
 --- Makefile.in	(revision 6439)
 +++ Makefile.in	(working copy)
 @@ -34,7 +34,7 @@
- 
+
  empty =
  OUTFLAG = @OUTFLAG@$(empty)
 -CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
 +CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@ @VALGRIND_CFLAGS@
  CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
  LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
- EXTLDFLAGS = 
+ EXTLDFLAGS =
 Index: configure.in
 ===================================================================
 --- configure.in	(revision 6439)
@@ -18,7 +18,7 @@ Index: configure.in
 @@ -895,6 +895,22 @@
      fi
  fi
- 
+
 +AC_ARG_ENABLE(valgrind,
 +       [  --enable-valgrind       use valgrind support],
 +       [want_valgrind=$enableval], [want_valgrind=auto])
@@ -37,10 +37,10 @@ Index: configure.in
 +
  dnl default value for $KANJI
  DEFAULT_KCODE="KCODE_NONE"
- 
+
 @@ -1504,6 +1520,7 @@
  esac
- 
+
  AC_SUBST(XCFLAGS)dnl
 +AC_SUBST(VALGRIND_CFLAGS)dnl
  AC_SUBST(XLDFLAGS)dnl
@@ -53,7 +53,7 @@ Index: eval.c
 @@ -28,6 +28,12 @@
  #define EXIT_FAILURE 1
  #endif
- 
+
 +#ifdef HAVE_VALGRIND
 +#include <valgrind/memcheck.h>
 +#else
@@ -61,7 +61,7 @@ Index: eval.c
 +#endif
 +
  #include <stdio.h>
- 
+
  #include "st.h"
 @@ -5225,6 +5231,9 @@
      int pcall;
@@ -80,7 +80,7 @@ Index: gc.c
 @@ -30,6 +30,12 @@
  #include <sys/resource.h>
  #endif
- 
+
 +#ifdef HAVE_VALGRIND
 +#include <valgrind/memcheck.h>
 +#else
@@ -93,7 +93,7 @@ Index: gc.c
 @@ -93,6 +99,9 @@
  {
      void *mem;
- 
+
 +    VALGRIND_MAKE_MEM_DEFINED(&malloc_increase, sizeof(malloc_increase));
 +    VALGRIND_MAKE_MEM_DEFINED(&malloc_limit, sizeof(malloc_limit));
 +
@@ -113,7 +113,7 @@ Index: gc.c
 @@ -713,7 +725,10 @@
  {
      register RVALUE *obj;
- 
+
 +    VALGRIND_MAKE_MEM_DEFINED(&ptr, sizeof(ptr));
      obj = RANY(ptr);
 +    VALGRIND_MAKE_MEM_DEFINED(obj, sizeof(*obj));

data/test/benchmark/bench.rb

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../lib")
 require 'bleak_house'
 
 Dike.logfactory("/tmp")
-if ARGV[0] 
+if ARGV[0]
   Dike.finger
   exec('cat /tmp/0')
 else

data/test/unit/test_bleak_house.rb

@@ -7,11 +7,11 @@ require 'rubygems'
 require 'echoe'
 require 'test/unit'
 require 'bleak_house'
-  
+
 class BleakHouseTest < Test::Unit::TestCase
 
   # Match the default hook filename, for convenience
-  FILE =  "/tmp/bleak.#{Process.pid}.0.dump" 
+  FILE =  "/tmp/bleak.#{Process.pid}.0.dump"
 
   def setup
     File.delete FILE rescue nil
@@ -22,15 +22,15 @@ class BleakHouseTest < Test::Unit::TestCase
     BleakHouse.snapshot(FILE)
     assert File.exist?(FILE)
     assert BleakHouse.heaps_used > 0
-    assert BleakHouse.heaps_length > 0    
+    assert BleakHouse.heaps_length > 0
   end
-  
+
   def test_exception
     assert_raises(RuntimeError) do
       BleakHouse.snapshot("/")
-    end    
+    end
   end
-  
+
   def test_analyze
     BleakHouse.snapshot(FILE)
     Dir.chdir(File.dirname(__FILE__) + "/../../bin") do
@@ -41,7 +41,7 @@ class BleakHouseTest < Test::Unit::TestCase
       assert_match(/\d+ __null__:__null__:__node__/, output[4])
     end
   end
-  
+
   def test_signal
     Echoe.silence do
       system("kill -s SIGUSR2 #{Process.pid}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: 4.1.1
+  version: "4.2"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-06-22 00:00:00 -04:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,17 +73,16 @@ files:
 - LICENSE
 - LICENSE_BSD
 - Manifest
+- Rakefile
 - README
-- ruby/configure.patch
-- ruby/gc.patch
-- ruby/ruby-1.8.6-p230.tar.bz2
+- ruby/ruby-1.8.6-p286.tar.bz2
+- ruby/ruby.patch
 - ruby/valgrind.patch
 - test/benchmark/bench.rb
 - test/test_helper.rb
 - test/unit/test_bleak_house.rb
 - TODO
 - bleak_house.gemspec
-- Rakefile
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/bleak_house/
 post_install_message: 
@@ -105,14 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A library for finding memory leaks.

data/ruby/gc.patch

@@ -1,129 +0,0 @@
-Index: parse.y
-===================================================================
---- parse.y	(revision 6446)
-+++ parse.y	(working copy)
-@@ -6168,6 +6168,11 @@
-  *                                     :wait2, :$>]
-  */
- 
-+struct st_table * 
-+rb_parse_sym_tbl() {
-+  return sym_tbl;
-+}
-+
- VALUE
- rb_sym_all_symbols()
- {
-Index: parse.c
-===================================================================
---- parse.c	(revision 6446)
-+++ parse.c	(working copy)
-@@ -11157,6 +11157,11 @@
-  *                                     :wait2, :$>]
-  */
- 
-+struct st_table * 
-+rb_parse_sym_tbl() {
-+  return sym_tbl;
-+}
-+
- VALUE
- rb_sym_all_symbols()
- {
-Index: gc.c
-===================================================================
---- gc.c	(revision 6446)
-+++ gc.c	(working copy)
-@@ -260,8 +260,6 @@
-     }
- }
- 
--#undef GC_DEBUG
--
- void
- rb_global_variable(var)
-     VALUE *var;
-@@ -296,10 +294,8 @@
- 	struct RVarmap varmap;
- 	struct SCOPE   scope;
-     } as;
--#ifdef GC_DEBUG
-     char *file;
-     int   line;
--#endif
- } RVALUE;
- 
- #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-@@ -318,6 +314,22 @@
- static int heaps_length = 0;
- static int heaps_used   = 0;
- 
-+struct heaps_slot *
-+rb_gc_heap_slots()
-+{
-+    return heaps;
-+}
-+
-+int
-+rb_gc_heaps_used() {
-+    return heaps_used;
-+}
-+
-+int
-+rb_gc_heaps_length() {
-+    return heaps_length;
-+}
-+
- #define HEAP_MIN_SLOTS 10000
- static int heap_slots = HEAP_MIN_SLOTS;
- 
-@@ -386,16 +398,19 @@
- rb_newobj()
- {
-     VALUE obj;
--
-+    
-     if (!freelist) garbage_collect();
- 
-     obj = (VALUE)freelist;
-     freelist = freelist->as.free.next;
--    MEMZERO((void*)obj, RVALUE, 1);
--#ifdef GC_DEBUG
--    RANY(obj)->file = ruby_sourcefile;
--    RANY(obj)->line = ruby_sourceline;
--#endif
-+
-+    MEMZERO((void*)obj, RVALUE, 1);    
-+
-+    if (ruby_current_node && ruby_current_node->nd_file) {
-+    	RANY(obj)->file = ruby_current_node->nd_file;
-+      RANY(obj)->line = nd_line(ruby_current_node);
-+    } 
-+    
-     return obj;
- }
- 
-@@ -732,7 +747,10 @@
-     if (rb_special_const_p(ptr)) return; /* special const not marked */
-     if (obj->as.basic.flags == 0) return;       /* free cell */
-     if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
-+
-     obj->as.basic.flags |= FL_MARK;
-+    /* mark our new reference point for sourcefile objects */
-+    mark_source_filename(RANY(obj)->file);
- 
-     if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
- 	if (!mark_stack_overflow) {
-Index: version.h
-===================================================================
---- version.h	(revision 6439)
-+++ version.h	(working copy)
-@@ -2,7 +2,7 @@
- #define RUBY_RELEASE_DATE "2008-06-20"
- #define RUBY_VERSION_CODE 186
- #define RUBY_RELEASE_CODE 20080620
--#define RUBY_PATCHLEVEL 230
-+#define RUBY_PATCHLEVEL 902
- 
- #define RUBY_VERSION_MAJOR 1
- #define RUBY_VERSION_MINOR 8