bleak_house 3.7.1 → 4.0

data/test/benchmark/bench.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'dike'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../lib")
+require 'bleak_house'
+
+Dike.logfactory("/tmp")
+if ARGV[0] 
+  Dike.finger
+  exec('cat /tmp/0')
+else
+  BleakHouse.snapshot("/tmp/0")
+  exec("#{$LOAD_PATH.first}/../bin/bleak /tmp/0")
+end
+

data/test/unit/test_bleak_house.rb

@@ -1,51 +1,50 @@
 
-DIR = File.dirname(__FILE__) + "/../../"
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../lib")
+
+ENV['NO_EXIT_HANDLER'] = "1"
 
 require 'rubygems'
+require 'echoe'
 require 'test/unit'
-require 'yaml'
-require 'ruby-debug'
-require 'ccsv'
-Debugger.start
+require 'bleak_house'
   
 class BleakHouseTest < Test::Unit::TestCase
-  require "#{DIR}lib/bleak_house/logger"
 
-  SNAPSHOT_FILE = "/tmp/bleak_house.dump"
+  # Match the default hook filename, for convenience
+  FILE =  "/tmp/bleak.#{Process.pid}.0.dump" 
 
   def setup
-    File.delete SNAPSHOT_FILE rescue nil
+    File.delete FILE rescue nil
   end
 
   def test_snapshot
     symbol_count = Symbol.all_symbols.size
-    ::BleakHouse::Logger.new.snapshot(SNAPSHOT_FILE, "test", false, 0)
-    assert_equal symbol_count, Symbol.all_symbols.size # Test that no symbols leaked
-    assert File.exist?(SNAPSHOT_FILE)
-    assert_equal 0, sample_ratio(SNAPSHOT_FILE)
-  end
-  
-  def test_sampling
-    ::BleakHouse::Logger.new.snapshot(SNAPSHOT_FILE, "test", false, 0.5)  
-    ratio = sample_ratio(SNAPSHOT_FILE) 
-    assert(ratio > 0.45)
-    assert(ratio < 0.55)
+    BleakHouse.snapshot(FILE)
+    assert File.exist?(FILE)
+    assert BleakHouse.heaps_used > 0
+    assert BleakHouse.heaps_length > 0    
   end
   
   def test_exception
     assert_raises(RuntimeError) do
-      ::BleakHouse::Logger.new.snapshot("/", "test", false, 0)
+      BleakHouse.snapshot("/")
     end    
   end
   
-  def sample_ratio(file)
-    rows = 0
-    samples = 0
-    Ccsv.foreach(file) do |row|
-      rows += 1
-      samples += 1 if row[2]
+  def test_analyze
+    BleakHouse.snapshot(FILE)
+    Dir.chdir(File.dirname(__FILE__) + "/../../bin") do
+      output = `./bleak #{FILE}`.split("\n")
+      # require 'ruby-debug/debugger'
+      assert_match(/\d+ __null__:__null__:__node__/, output[3])
     end
-    samples / rows.to_f
   end
   
+  def test_signal
+    Echoe.silence do
+      system("kill -s SIGUSR2 #{Process.pid}")
+    end
+    assert File.exist?(FILE)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: 3.7.1
+  version: "4.0"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,32 +30,22 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-03-30 00:00:00 -04:00
+date: 2008-04-06 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ccsv
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.1"
-    version: 
+dependencies: []
+
 description: A library for finding memory leaks.
 email: ""
 executables: 
 - bleak
 extensions: 
-- ext/bleak_house/logger/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: 
 - CHANGELOG
-- ext/bleak_house/logger/snapshot.c
-- lib/bleak_house/analyzer/analyzer.rb
+- ext/snapshot.c
 - lib/bleak_house/analyzer.rb
-- lib/bleak_house/logger/source.rb
-- lib/bleak_house/logger.rb
-- lib/bleak_house/rails/bleak_house.rb
+- lib/bleak_house/hook.rb
+- lib/bleak_house.rb
 - LICENSE
 - LICENSE_BSD
 - README
@@ -63,78 +53,24 @@ extra_rdoc_files:
 files: 
 - 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
+- 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/logger/source.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/hook.rb
 - lib/bleak_house.rb
 - LICENSE
 - LICENSE_BSD
 - Manifest
 - README
-- ruby/gc.c.patch
-- ruby/parse.y.patch
-- ruby/ruby-1.8.6-p110.tar.bz2
-- test/integration/app/app/controllers/application.rb
-- test/integration/app/app/controllers/items_controller.rb
-- test/integration/app/app/helpers/application_helper.rb
-- test/integration/app/app/helpers/items_helper.rb
-- test/integration/app/app/views/items/index.rhtml
-- test/integration/app/config/boot.rb
-- test/integration/app/config/database.yml
-- test/integration/app/config/environment.rb
-- test/integration/app/config/environments/development.rb
-- test/integration/app/config/environments/production.rb
-- test/integration/app/config/environments/test.rb
-- test/integration/app/config/initializers/inflections.rb
-- test/integration/app/config/initializers/mime_types.rb
-- test/integration/app/config/routes.rb
-- test/integration/app/doc/README_FOR_APP
-- test/integration/app/public/404.html
-- test/integration/app/public/422.html
-- test/integration/app/public/500.html
-- test/integration/app/public/dispatch.cgi
-- test/integration/app/public/dispatch.fcgi
-- test/integration/app/public/dispatch.rb
-- test/integration/app/public/favicon.ico
-- test/integration/app/public/images/rails.png
-- test/integration/app/public/javascripts/application.js
-- test/integration/app/public/javascripts/controls.js
-- test/integration/app/public/javascripts/dragdrop.js
-- test/integration/app/public/javascripts/effects.js
-- test/integration/app/public/javascripts/prototype.js
-- test/integration/app/public/robots.txt
-- test/integration/app/Rakefile
-- test/integration/app/README
-- test/integration/app/script/about
-- test/integration/app/script/console
-- test/integration/app/script/destroy
-- test/integration/app/script/generate
-- test/integration/app/script/performance/benchmarker
-- test/integration/app/script/performance/profiler
-- test/integration/app/script/performance/request
-- test/integration/app/script/plugin
-- test/integration/app/script/process/inspector
-- test/integration/app/script/process/reaper
-- test/integration/app/script/process/spawner
-- test/integration/app/script/runner
-- test/integration/app/script/server
-- test/integration/app/test/functional/items_controller_test.rb
-- test/integration/app/test/test_helper.rb
-- test/integration/server_test.rb
-- test/misc/direct.rb
+- 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
@@ -167,10 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: A library for finding memory leaks.
 test_files: 
-- test/integration/server_test.rb
+- test/test_helper.rb
 - test/unit/test_bleak_house.rb

data/ext/bleak_house/logger/build_logger.rb

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

data/ext/bleak_house/logger/snapshot.c

@@ -1,204 +0,0 @@
-#include <time.h>
-#include "snapshot.h"
-
-static VALUE rb_mBleakHouse;
-static VALUE rb_cC;
-
-/* Number of struct heaps_slots used */
-static VALUE heaps_used(VALUE self) {
-  return INT2FIX(rb_gc_heaps_used());
-}
-
-/* Length of the struct heaps_slots allocated */
-static VALUE heaps_length(VALUE self) {
-  return INT2FIX(rb_gc_heaps_length());
-}
-
-/* Count the live objects on the heap and in the symbol table and write a CSV frame to <tt>_logfile</tt>. Set <tt>_specials = true</tt> if you also want to count AST nodes and var scopes; otherwise, use <tt>false</tt>. Note that common classes in the CSV output are hashed to small integers in order to save space.*/
-static VALUE snapshot(VALUE self, VALUE _logfile, VALUE tag, VALUE _specials, VALUE _sampler) {
-  Check_Type(_logfile, T_STRING);
-  Check_Type(tag, T_STRING);
-
-  RVALUE *obj, *obj_end;
-  st_table_entry *sym; 
-  
-  /* printf("Requested: %f\n", rb_num2dbl(_sampler)); */
-  
-  struct heaps_slot * heaps = rb_gc_heap_slots();
-  struct st_table * sym_tbl = rb_parse_sym_tbl();
-
-  int specials = RTEST(_specials);
-  int hashed;
-
-  /* see if the logfile exists already */
-  FILE *logfile = fopen(StringValueCStr(_logfile), "r");
-  int is_new;
-  if (!(is_new = (logfile == NULL)))
-    fclose(logfile);
-
-  /* reopen for writing */
-  if ((logfile = fopen(StringValueCStr(_logfile), "a+")) == NULL)
-    rb_raise(rb_eRuntimeError, "couldn't open snapshot file");
-
-  /* write the time */
-  fprintf(logfile, "-1,%li\n", time(0));
-  
-  /* get and write the memory usage */
-  /* VALUE mem = rb_funcall(self, rb_intern("mem_usage"), 0);
-  fprintf(logfile, "-2,%li\n", NUM2INT(RARRAY_PTR(mem)[0]));
-  fprintf(logfile, "-3,%li\n", NUM2INT(RARRAY_PTR(mem)[1])); */
-  
-  int filled_slots = 0;
-  int free_slots = 0;
-
-  /* write the tag header */
-  fprintf(logfile, "-4,%s\n", StringValueCStr(tag));
-
-  int i; 
-  
-  /* walk the heap */
-  for (i = 0; i < rb_gc_heaps_used(); i++) {
-    obj = heaps[i].slot;
-    obj_end = obj + heaps[i].limit;
-    for (; obj < obj_end; obj++) {
-      if (obj->as.basic.flags) { /* always 0 for freed objects */
-        filled_slots ++;
-        switch (TYPE(obj)) {
-          case T_NONE:
-              hashed = BUILTINS_SIZE + 0; break;
-          case T_BLKTAG:
-              hashed = BUILTINS_SIZE + 1; break;
-          case T_UNDEF:
-              hashed = BUILTINS_SIZE + 2; break;
-          case T_VARMAP:
-              hashed = BUILTINS_SIZE + 3; break;
-          case T_SCOPE:
-              hashed = BUILTINS_SIZE + 4; break;
-          case T_NODE:
-              hashed = BUILTINS_SIZE + 5; break;
-          default:
-            if (!obj->as.basic.klass) {
-              hashed = BUILTINS_SIZE + 6;
-            } else {
-              hashed = lookup_builtin(rb_obj_classname((VALUE)obj));
-            }
-        }
-        
-        /* write to log */
-        if (specials || hashed < BUILTINS_SIZE) {
-          /* write classname */
-          if (hashed < 0) {
-            /* regular classname */
-            fprintf(logfile, "%s", rb_obj_classname((VALUE)obj));
-          } else {
-            /* builtins key */
-            /* 0 is not used for 'hashed' because Ruby's to_i turns any String into 0 */
-            fprintf(logfile, "%i", hashed + 1); 
-          }
-
-          /* write id */
-          fprintf(logfile, ",%lu", FIX2ULONG(rb_obj_id((VALUE)obj)));
-
-          /* write sample, if requested */
-          if (hashed < BUILTINS_SIZE) {
-            if (rand()/((double)RAND_MAX + 1) < rb_num2dbl(_sampler)) {
-              fprintf(logfile, ",%s", rb_rescue(inspect, (VALUE)obj, handle_exception, Qnil));
-            }
-          }
-          
-          /* write newline */
-          fprintf(logfile, "\n");
-        }        
-      } else {
-        free_slots ++;
-      }
-    }
-  }
-  
-  /* 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, "-5,%i\n", filled_slots);
-  fprintf(logfile, "-6,%i\n", free_slots);
-  fclose(logfile);
-    
-  for (i = 0; i < 3; i++) {
-    /* request GC run */
-    rb_funcall(rb_mGC, rb_intern("start"), 0); 
-  }
-  
-  return Qtrue;
-}
-
-char * inspect(VALUE obj) {  
-  VALUE value;
-  char * string;
-  int i, length;
-  
-  value = rb_funcall((VALUE)obj, rb_intern("inspect"), 0);
-  string = StringValueCStr(value);
-  length = strlen(string);
-  
-  if (length > MAX_SAMPLE_LENGTH) {
-    string[MAX_SAMPLE_LENGTH] = '\0';
-    length = MAX_SAMPLE_LENGTH;
-  }
-  
-  /* Replace control characters */
-  for (i = 0; i < length; i++) {
-    if (string[i] == '\n') {
-      string[i] = ' ';
-    } if (string[i] == ',') {
-      string[i] = ' ';
-    }
-  }
-    
-  /* result = rb_funcall(result, rb_intern("gsub"), 2, rb_str_new2(","), rb_str_new2(",")); */
-  return string;
-}
-
-char * handle_exception(VALUE unused) {
-  return "";
-}
-
-int lookup_builtin(char * name) {
-  int i;
-  for (i = 0; i < BUILTINS_SIZE; i++) {
-    if (!strcmp(builtins[i], name)) return i;      
-  }
-  return -1;
-}
-
-/*
-
-This class performs the actual object logging of BleakHouse. To use it directly, you need to make calls to BleakHouse::Logger#snapshot. 
-
-== Example
-
-At the start of your app, put:
-  require 'rubygems'
-  require 'bleak_house'
-  $memlogger = BleakHouse::Logger.new
-  File.delete($logfile = "/path/to/logfile") rescue nil
-
-Now, at the points of interest, put:
-  $memlogger.snapshot($logfile, "tag/subtag", false)
-
-Run your app. Once you are done, analyze your data:
-  bleak /path/to/logfile
-  
-*/
-void
-Init_snapshot()
-{
-  rb_mBleakHouse = rb_define_module("BleakHouse");
-  rb_cC = rb_define_class_under(rb_mBleakHouse, "Logger", rb_cObject);
-  rb_define_method(rb_cC, "snapshot", snapshot, 4);
-  rb_define_method(rb_cC, "heaps_used", heaps_used, 0);
-  rb_define_method(rb_cC, "heaps_length", heaps_length, 0);
-}