bleak_house 4.0 → 4.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.1. Support calculating deltas in analyze utility.
+
 v4.0. Track spawn points live instead of sampling.
 
 v3.7.1. Fix some nil issues with corrupted dumps (cody caughlan).

data/Manifest

@@ -12,7 +12,6 @@ LICENSE
 LICENSE_BSD
 Manifest
 README
-ruby/bleak_house.patch
 ruby/configure.patch
 ruby/gc.patch
 ruby/ruby-1.8.6-p114.tar.bz2

data/README

@@ -17,7 +17,7 @@ If you use this software, please {make a donation}[http://blog.evanweaver.com/do
 * minimal impact on runtime performance
 * fast analysis step
 * tracks all objects allocated on the heap, including internal types like <tt>T_NODE</tt>
-* easy integration in any program, not just Rails
+* easy integration into any program, not just Rails
 
 == Requirements
 
@@ -48,13 +48,13 @@ Then, to engage the logger (possibly in a live deployment situation), start a se
 Look for the message:
   ** Bleakhouse: installed  
 
-Browse around manually, thrash your entire app with a script, target troublesome controllers/actions, etc. After a couple hundred requests, hit CTRL-C. The server will stop and BleakHouse will produce a dumpfile in <tt>/tmp</tt>:
+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>:
 
   ** BleakHouse: working...
   ** BleakHouse: complete
   ** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
 
-To analyse it, just run the listed command. The top 20 leakiest lines will be listed:
+To analyze it, just run the listed command. The top 20 leakiest lines will be listed:
 
   191691 total objects
   Final heap size 191691 filled, 220961 free
@@ -73,8 +73,6 @@ You can pass an integer as the second parameter to <tt>bleak</tt> if you want to
 
 The underscored types are special Ruby internal structs, but can be real leaks just as easily as fullblown classes. 
 
-Do not try to detect Rails leaks in <tt>development</tt> mode. Make a separate <tt>benchmark</tt> environment if you need to, and make sure all your production caching is turned on.
-
 = Extras
 
 == Injecting a signal
@@ -83,6 +81,8 @@ You can send <tt>SIGUSR2</tt> to a BleakHouse-instrumented program to snag a dum
 
 == Tips
 
+Do not try to detect Rails leaks in <tt>development</tt> mode. Make a separate <tt>benchmark</tt> environment if you need to, and make sure all your production caching is turned on.
+
 It is normal to see lots of <tt>null:null</tt> references, especially for nodes. Using <tt>eval()</tt> too much can be a cause of node leaks. You can track <tt>eval()</tt> by using sourceline macros in your code:
 
   eval("CODE", nil, __FILE__, __LINE__)
@@ -91,7 +91,7 @@ You may get library require errors if you install <tt>ruby-bleak-house</tt> 1.8.
 
 It is not recommended that you use <tt>ruby-bleak-house</tt> as your production Ruby binary, since it will be slightly slower and use slightly more memory. It is unlikely, however, to affect stability.
 
-If BleakHouse doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or have encounted a {real leak in the interpreter}[http://groups.google.com/group/god-rb/browse_thread/thread/1cca2b7c4]. Try using Valgrind[http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/] instead.
+If BleakHouse doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or have encounted a {real leak in the interpreter}[http://groups.google.com/group/god-rb/browse_thread/thread/01cca2b7c4a581c2]. Try using Valgrind[http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/] instead.
 
 == Methods
 
@@ -111,6 +111,7 @@ Patches and contributions are very welcome. Please note that contributors are re
 
 == Further resources
 
+* http://blog.evanweaver.com/articles/2008/04/06/bleakhouse-4/
 * http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/
 * http://blog.evanweaver.com/articles/2007/05/12/let-me-hit-you-with-some-knowledge
 * http://blog.evanweaver.com/articles/2007/05/06/leak-proof-direct-heap-instrumentation-for-bleak_house

data/TODO

@@ -1,3 +1,8 @@
 
-* Add some kind of delta support
-* Log several levels of the backtrace instead of just the current node's information
+* Override Kernel#eval to always include sourceline macros.
+* Mimic Valgrind's output format as much as possible
+* Log remaining heap reference traces
+* Add some kind of start/end delta support
+* Log entire backtrace by allocating pointer arrays on the heap
+  - Add some kind of hashing procedure to avoid duplicating identical backtrace pointer arrays
+* Report individual types of nodes

data/bin/bleak

@@ -3,11 +3,11 @@
 require 'rubygems'
 
 if !ARGV[0]
-  puts "Please specify a BleakHouse logfile"
+  puts "Please specify up to two BleakHouse logfiles"
   exit
 else
   $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib/"
   require 'bleak_house/analyzer'
   require 'ruby-debug' if ENV['DEBUG']
-  BleakHouse::Analyzer.run(ARGV[0], ARGV[1] || 20)
+  BleakHouse::Analyzer.run(*ARGV)
 end

data/bleak_house.gemspec

@@ -1,29 +1,29 @@
 
-# Gem::Specification for Bleak_house-4.0
+# Gem::Specification for Bleak_house-4.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{bleak_house}
-  s.version = "4.0"
+  s.version = "4.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2008-04-06}
+  s.date = %q{2008-05-26}
   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", "README", "ruby/bleak_house.patch", "ruby/configure.patch", "ruby/gc.patch", "ruby/ruby-1.8.6-p114.tar.bz2", "ruby/valgrind.patch", "test/benchmark/bench.rb", "test/test_helper.rb", "test/unit/test_bleak_house.rb", "TODO", "bleak_house.gemspec"]
+  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", "README", "ruby/configure.patch", "ruby/gc.patch", "ruby/ruby-1.8.6-p114.tar.bz2", "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.1.0}
+  s.rubygems_version = %q{1.1.1}
   s.summary = %q{A library for finding memory leaks.}
   s.test_files = ["test/test_helper.rb", "test/unit/test_bleak_house.rb"]
 end

data/ext/snapshot.c

@@ -58,14 +58,7 @@ static VALUE snapshot(VALUE self, VALUE _logfile) {
         if (obj->file) {
           chr = obj->file;          
           if (*chr != '\0') {
-            /* replace unprintable characters */
-            for (; *chr; chr++) {
-              if ((*chr < 33) || (*chr > 126)) {
-                fputc('_', logfile);
-              } else {
-                fputc(*chr, logfile);
-              }
-            }
+            fprintf(logfile, "%s", obj->file);
           } else {
             fprintf(logfile, "__empty__");   
           }

data/lib/bleak_house/analyzer.rb

@@ -2,23 +2,52 @@
 module BleakHouse
   module Analyzer
 
-    # Analyze a compatible <tt>bleak.dump</tt>. Accepts a filename and the number of lines to display.
-    def self.run(file, lines)
-      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      
+    # Analyze a compatible <tt>bleak.dump</tt>. Accepts one or more filename and the number of lines to display.
+    def self.run(*args)
+      lines = args.last[/^\d+$/] ? args.pop.to_i : 20
 
-      puts "#{length} total objects"
-      puts "Final heap size #{filled}, #{free}"
-      puts "Displaying top #{lines} most common line/class pairs\n"            
-        
-      cmd = ENV['NO_TRACE'] ? "awk -F: '{print $3}' " + file : "cat #{file}"      
-      cmd += " | sort | uniq -c | sort -nr | head -#{lines}"
+      raise "Can't diff more than 2 files" if args.size > 2
+      
+      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}"      
+        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 outputs.first
+      else
+        puts "Displaying change in top #{lines} most common line/class pairs"        
+        puts diff(outputs)
+      end
 
-      puts `#{cmd}`
+    end
+    
+    def self.diff(outputs)
+      # Calculate the diff
+      diff = Hash.new(0)
+      # Iterate each item
+      outputs.each_with_index do |output, index|
+        output[3..-1].each do |line|
+          c, key = line.split(" ", 2)
+          index.zero? ? diff[key] -= c.to_i : diff[key] += c.to_i
+        end
+      end
+      # Format the lines in descending order
+      diff.sort_by do |key, value|
+        -value
+      end.map do |key, value|
+        "#{value.to_s.rjust(6)} #{key}"
+      end    
     end
     
   end

data/ruby/gc.patch

@@ -114,3 +114,16 @@ Index: gc.c
  
      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-03-03"
+ #define RUBY_VERSION_CODE 186
+ #define RUBY_RELEASE_CODE 20080303
+-#define RUBY_PATCHLEVEL 114
++#define RUBY_PATCHLEVEL 901
+ 
+ #define RUBY_VERSION_MAJOR 1
+ #define RUBY_VERSION_MINOR 8

data/ruby/valgrind.patch

@@ -46,19 +46,6 @@ Index: configure.in
  AC_SUBST(XLDFLAGS)dnl
  AC_SUBST(LIBRUBY_LDSHARED)
  AC_SUBST(LIBRUBY_DLDFLAGS)
-Index: version.h
-===================================================================
---- version.h	(revision 6439)
-+++ version.h	(working copy)
-@@ -2,7 +2,7 @@
- #define RUBY_RELEASE_DATE "2008-03-03"
- #define RUBY_VERSION_CODE 186
- #define RUBY_RELEASE_CODE 20080303
--#define RUBY_PATCHLEVEL 114
-+#define RUBY_PATCHLEVEL 901
- 
- #define RUBY_VERSION_MAJOR 1
- #define RUBY_VERSION_MINOR 8
 Index: eval.c
 ===================================================================
 --- eval.c	(revision 6439)

data/test/unit/test_bleak_house.rb

@@ -36,7 +36,9 @@ class BleakHouseTest < Test::Unit::TestCase
     Dir.chdir(File.dirname(__FILE__) + "/../../bin") do
       output = `./bleak #{FILE}`.split("\n")
       # require 'ruby-debug/debugger'
-      assert_match(/\d+ __null__:__null__:__node__/, output[3])
+      assert_match(/top 20 most common/, output[0])
+      assert_match(/free heap/, output[3])
+      assert_match(/\d+ __null__:__null__:__node__/, output[4])
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "4.0"
+  version: "4.1"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-04-06 00:00:00 -04:00
+date: 2008-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +65,6 @@ files:
 - LICENSE_BSD
 - Manifest
 - README
-- ruby/bleak_house.patch
 - ruby/configure.patch
 - ruby/gc.patch
 - ruby/ruby-1.8.6-p114.tar.bz2
@@ -103,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A library for finding memory leaks.

data/ruby/bleak_house.patch

@@ -1,358 +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: configure
-===================================================================
---- configure	(revision 6446)
-+++ configure	(working copy)
-@@ -720,6 +720,7 @@
- ARCHFILE
- RDOCTARGET
- XCFLAGS
-+VALGRIND_CFLAGS
- XLDFLAGS
- LIBRUBY_LDSHARED
- LIBRUBY_DLDFLAGS
-@@ -1356,6 +1357,7 @@
-   --enable-pthread        use pthread library.
-   --disable-fastthread    do not use the fastthread mutex
-   --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.
-+  --enable-valgrind       use valgrind support
-   --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 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -13034,13 +13034,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -15768,6 +15766,172 @@
-     fi
- fi
- 
-+# Check whether --enable-valgrind was given.
-+if test "${enable_valgrind+set}" = set; then
-+  enableval=$enable_valgrind; want_valgrind=$enableval
-+else
-+  want_valgrind=auto
-+fi
-+
-+
-+if test x"$want_valgrind" != xno; then
-+
-+for ac_header in valgrind/memcheck.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ have_valgrind=yes
-+else
-+  have_valgrind=no
-+fi
-+
-+done
-+
-+	if test x"$have_valgrind" = xyes; then
-+		cat >>confdefs.h <<\_ACEOF
-+#define HAVE_VALGRIND 1
-+_ACEOF
-+
-+		VALGRIND_CFLAGS="";
-+	elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then
-+		{ { echo "$as_me:$LINENO: error: valgrind support requested but valgrind not found" >&5
-+echo "$as_me: error: valgrind support requested but valgrind not found" >&2;}
-+   { (exit 1); exit 1; }; }
-+	else
-+	  VALGRIND_CFLAGS="";
-+	fi
-+fi
-+
- DEFAULT_KCODE="KCODE_NONE"
- 
- 
-@@ -17854,6 +18018,7 @@
- ARCHFILE!$ARCHFILE$ac_delim
- RDOCTARGET!$RDOCTARGET$ac_delim
- XCFLAGS!$XCFLAGS$ac_delim
-+VALGRIND_CFLAGS!$VALGRIND_CFLAGS$ac_delim
- XLDFLAGS!$XLDFLAGS$ac_delim
- LIBRUBY_LDSHARED!$LIBRUBY_LDSHARED$ac_delim
- LIBRUBY_DLDFLAGS!$LIBRUBY_DLDFLAGS$ac_delim
-@@ -17887,7 +18052,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-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) {