bleak_house 5.2 → 5.3

data/CHANGELOG

@@ -1,6 +1,7 @@
 
 BleakHouse Changelog
 
+5.3. subtract rails core counts from action counts and convolve
 5.2. change smoothing algorithm to be more intuitive and so mem usage is correct
 5.1. close file properly
 5. totally awesome C instrumentation

data/README

@@ -1,7 +1,7 @@
 
 BleakHouse
 
-REQUIREMENTS:
+REQUIREMENTS
 
 A *nix operating system. Windows is not supported.
 
@@ -11,7 +11,7 @@ It is highly recommended that you compile the bleak_house patched
 Ruby build. In the plugin directory: 
   rake ruby:build
 
-USAGE:
+USAGE
 
 To profile your application:
   RAILS_ENV=production BLEAK_HOUSE=true ruby-bleak-house ./script/server 
@@ -20,20 +20,20 @@ Browse around manually, thrash your entire app with a script,
 target troublesome controllers/actions, etc.
 
 Then, to analyze:
-  RAILS_ENV=production SMOOTHNESS=2 rake bleak_house:analyze
+  RAILS_ENV=production SMOOTHNESS=1 rake bleak_house:analyze
 
 And then look in log/bleak_house/.
 
 TROUBLESHOOTING
 
 If you see the error "Symbol not found: _rb_gc_heaps_used",
-it means you installed the patched binary, but tried to run the 
+it means you installed the patched binary, but tried to profile the 
 server with the regular binary.
 
 You may get library require errors if you install ruby-bleak-house (1.8.6)
 alongside a different verson of Ruby. You could try to patch your local
 version of Ruby instead, or you could just upgrade to 1.8.6, which has
-a good trackrecord or stability anyway.
+a good trackrecord of stability anyway.
 
 COPYRIGHT AND LICENSING
 

data/lib/bleak_house/analyze.rb

@@ -18,7 +18,7 @@ Gruff::Base::MAX_LEGENDS = 28
 class BleakHouse
   class Analyze    
   
-    SMOOTHNESS = ((i = ENV['SMOOTHNESS'].to_i) < 2 ? 2 : i)/2 * 2
+    SMOOTHNESS = ENV['SMOOTHNESS'].to_i.zero? ? 1 : ENV['SMOOTHNESS'].to_i
     MEM_KEY = "memory usage"
     DIR = "#{RAILS_ROOT}/log/bleak_house/"
     
@@ -28,6 +28,10 @@ class BleakHouse
       @name = name
     end 
     
+    def d
+      self.class.d
+    end
+    
     def draw    
       g = Gruff::Line.new("1024x768")
       g.title = @name
@@ -49,6 +53,7 @@ class BleakHouse
       @increments.each_with_index do |increment, index|
         labels[index] = increment if (index % mod).zero?
       end
+            
       g.labels = labels
       
       g.minimum_value = 0
@@ -63,12 +68,17 @@ class BleakHouse
       data.each_with_index do |frameset, index|
         increments << frameset.time
         frameset.data.keys.select do |key| 
-          key =~ selector #or key =~ Regexp.new(specials.keys.join('|'))
+          # aggregate common keys based on the selection regexs
+          key =~ selector
         end.each do |key|
           aggregate_data[key.to_s[namer, 1]] ||= []
           aggregate_data[key.to_s[namer, 1]][index] += frameset.data[key].to_i
         end
-      end                 
+      end
+      aggregate_data.each do |key, value|
+        # extend the length of every value set to the end of the run
+        aggregate_data[key][increments.size - 1] ||= nil
+      end
       [aggregate_data, increments]
     end
     
@@ -83,20 +93,32 @@ class BleakHouse
       Dir.chdir(DIR) do        
 
         puts "parsing data"
-        data = YAML.load_file(filename)
+        data = YAML.load_file(filename)                
+        
+        # subtract core counts from action
+        data = data[0..(-1 - data.size % 2)]
+        data = data.in_groups_of(2).map do |frames|
+          core, action = frames.first, frames.last
+          action.data.each do |key, value|
+            action.data[key] = value - core.data[key[/::::(.*)/,1]].to_i
+          end          
+          [action.time, core.data.merge(action.data)]
+        end
+                
+        # smooth
         data = data[0..(-1 - data.size % SMOOTHNESS)]
         data = data.in_groups_of(SMOOTHNESS).map do |frames|
           timestamp = frames.map(&:time).sum / SMOOTHNESS
           values = frames.map(&:data).inject(Hash.new(0)) do |total, this_frame|
             this_frame.each do |key, value|
-              # hackz are because we want to average the memory usage, but conflate the core/action frames
-              total[key] += (value / SMOOTHNESS.to_f * (key =~ /^#{MEM_KEY}/ ? 1.0 : 2.0))
+              total[key] += value / SMOOTHNESS.to_f
             end
           end
           [Time.at(timestamp).strftime("%H:%M:%S"), values]
         end                     
         puts "#{data.size} frames after smoothing"
-
+        
+        # generate initial controller graph
         puts "entire app"
         controller_data, increments = aggregate(data, //, /^(.*?)($|\/|::::)/)
         if controller_data.has_key? MEM_KEY
@@ -110,7 +132,6 @@ class BleakHouse
         # in each controller, by action
         controller_data.keys.each do |controller|
           @mem = (controller == MEM_KEY)
-          next unless @mem
           puts(@mem ? "  #{controller}" : "  action for #{controller} controller")
           Dir.descend(controller) do             
             action_data, increments = aggregate(data, /^#{controller}($|\/|::::)/, /\/(.*?)($|\/|::::)/)
@@ -132,5 +153,9 @@ class BleakHouse
       end    
     end 
     
+    def self.d
+      require 'ruby-debug'; Debugger.start; debugger
+    end
+        
   end
 end

data/lib/bleak_house/bleak_house.rb

@@ -20,13 +20,14 @@ class BleakHouse
     end
   end
 
-  LOGFILE = "#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.dump"
+  LOGFILE = "#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.yaml.log"
   if File.exists?(LOGFILE)
     File.rename(LOGFILE, "#{LOGFILE}.old") 
     warn "renamed old logfile"
   end
   
   WITH_SPECIALS = false
+  GC = true
 
   MEMLOGGER = if ENV['MEMLOGGER'] !~ /ruby/i and (ENV['MEMLOGGER'] =~ /c/i or 
     `which ruby-bleak-house` !~ /no ruby_bleak_house/)    

data/lib/bleak_house/dispatcher.rb

@@ -6,13 +6,13 @@ class Dispatcher
     def prepare_application_with_bleak_house
       prepare_application_without_bleak_house
       BleakHouse::MEMLOGGER.snapshot(BleakHouse::LOGFILE, 'core rails', BleakHouse::WITH_SPECIALS)
-      GC.start
+      GC.start if BleakHouse::GC
     end
     alias_method_chain :prepare_application, :bleak_house
     
     def reset_after_dispatch_with_bleak_house
       BleakHouse::MEMLOGGER.snapshot(BleakHouse::LOGFILE, BleakHouse.last_request_name || 'unknown', BleakHouse::WITH_SPECIALS)
-      GC.start
+      GC.start if BleakHouse::GC
       reset_after_dispatch_without_bleak_house
     end
     alias_method_chain :reset_after_dispatch, :bleak_house

data/lib/bleak_house/support_methods.rb

@@ -44,4 +44,7 @@ class Symbol
   def =~ regex
     self.to_s =~ regex
   end
+  def [](*args)
+    self.to_s[*args]
+  end
 end

data/tasks/bleak_house_tasks.rake

@@ -8,7 +8,7 @@ namespace :bleak_house do
     rescue LoadError
       require 'bleak_house/analyze' 
     end        
-    BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.dump")
+    BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.yaml.log")
   end  
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "5.2"
-date: 2007-05-07 00:00:00 -04:00
+  version: "5.3"
+date: 2007-05-08 00:00:00 -04:00
 summary: BleakHouse is a Rails plugin for finding memory leaks. It tracks ObjectSpace for your entire app, and produces charts of references by controller, by action, and by object class.
 require_paths: 
 - lib
@@ -27,7 +27,7 @@ signing_key:
 cert_chain: 
 post_install_message: |+
   
-  Thanks for installing Bleak House 5.2. 
+  Thanks for installing Bleak House 5.3. 
   
   For each Rails app you want to profile, you will need to add the following 
   rake task in RAILS_ROOT/lib/tasks/bleak_house_tasks.rake to be able to run 
@@ -38,7 +38,7 @@ post_install_message: |+
       task :analyze do    
       rescue LoadError
         end        
-        BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.dump")
+        BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.yaml.log")
       end  
     end