bleak_house 6 → 7

data/CHANGELOG

@@ -1,6 +1,7 @@
 
 BleakHouse Changelog
 
+7. detect if core keys are present or not; fixes for analyzing non-rails apps
 6. log heap usage, remove pure-ruby profiler
 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

data/Rakefile

@@ -15,7 +15,7 @@ begin
   VERS = `cat CHANGELOG`[/^([\d\.]+)\. /, 1]
   
   taskmsg = File.open(DIR + "/tasks/bleak_house_tasks.rake").readlines
-  taskmsg = taskmsg[0..3] + [taskmsg[7][2..-1]] + taskmsg[9..-1]
+  taskmsg = taskmsg[0..3] + [taskmsg[9][2..-1]] + taskmsg[12..-1]
   
   echoe = Echoe.new("bleak_house", VERS) do |p|
     p.author = "Evan Weaver" 
@@ -35,9 +35,9 @@ begin
 "
 Thanks for installing Bleak House #{VERS}. 
 
-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 
-the analyzer: 
+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 the analyzer: 
 " + taskmsg.join("  ") + "\n"}
   end
             

data/lib/bleak_house/analyze.rb

@@ -11,6 +11,7 @@ require 'gruff'
 load "#{File.dirname(__FILE__)}/gruff_hacks.rb"
 load "#{File.dirname(__FILE__)}/support_methods.rb"
 
+Gruff::Base.send(:remove_const, "LEFT_MARGIN") # silence a warning
 Gruff::Base::LEFT_MARGIN = 200
 Gruff::Base::NEGATIVE_TOP_MARGIN = 30
 Gruff::Base::MAX_LEGENDS = 28
@@ -21,7 +22,7 @@ class BleakHouse
     SMOOTHNESS = ENV['SMOOTHNESS'].to_i.zero? ? 1 : ENV['SMOOTHNESS'].to_i
     MEM_KEY = "memory usage"
     HEAP_KEY = "heap usage"
-    DIR = "#{RAILS_ROOT}/log/bleak_house/"
+    CORE_KEY = "core rails"
     
     def initialize(data, increments, name)
       @data = data
@@ -92,23 +93,31 @@ class BleakHouse
       unless File.exists? filename
         puts "No data file found: #{filename}"
         exit 
-      end
-      FileUtils.rm_r(DIR) rescue nil
-      Dir.mkdir(DIR)
-
-      Dir.chdir(DIR) do        
-
-        puts "parsing data"
-        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 
+      puts "parsing data"
+      data = YAML.load_file(filename)                
+ 
+      rootdir = File.dirname(filename) + "/bleak_house/"     
+      FileUtils.rm_r(rootdir) rescue nil
+      Dir.mkdir(rootdir)      
+      Dir.chdir(rootdir) do        
+              
+        labels = ["controller", "action"]
+        # autodetect need for rails snapshot conflation
+        if data.first.last.keys.first =~ /^#{CORE_KEY}::::/
+          # 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
+          puts "  conflated core rails snapshots with their actions"
+        else
+          puts "  assuming custom snapshotting"
+          labels = ["tag", "subtag"]
         end
                 
         # smooth
@@ -122,45 +131,48 @@ class BleakHouse
           end
           [Time.at(timestamp).strftime("%H:%M:%S"), values]
         end                     
-        puts "#{data.size} frames after smoothing"
-        
-        # generate initial controller graph
-        puts "entire app"
+        puts "  #{data.size} frames after smoothing"
         
+        # scale memory/heap frames
         controller_data, increments = aggregate(data, //, /^(.*?)($|\/|::::)/)
         controller_data_without_specials = controller_data.dup
         controller_data_without_specials.delete(MEM_KEY)
         controller_data_without_specials.delete(HEAP_KEY)
         [HEAP_KEY, MEM_KEY].each do |key|
-#          next unless controller_data[key]
           scale_factor = controller_data_without_specials.values.flatten.to_i.max / controller_data[key].max.to_f * 0.8 rescue 1
           controller_data[key] = controller_data[key].map{|x| (x * scale_factor).to_i }
         end
-        Analyze.new(controller_data, increments, "objects by controller").draw
+        
+        # generate initial controller graph        
+        puts(title = "objects by #{labels[0]}")
+        Analyze.new(controller_data, increments, title).draw
 
         # in each controller, by action
         controller_data.keys.each do |controller|
 #          next unless controller == HEAP_KEY
-          @special = [MEM_KEY, HEAP_KEY].include? controller
-          puts(@special ? "  #{controller}" : "  action for #{controller} controller")
+          @mem = [MEM_KEY, HEAP_KEY].include? controller
+          @core = [CORE_KEY].include? controller
           Dir.descend(controller) do             
             action_data, increments = aggregate(data, /^#{controller}($|\/|::::)/, /\/(.*?)($|\/|::::)/)
-            Analyze.new(action_data, increments, case controller
-              when MEM_KEY then "#{controller} in kilobytes" 
-              when HEAP_KEY then "#{controller} in slots"
-              else "objects by action in /#{controller}_controller"
-            end).draw          
-          
+            unless @core
+              puts("  " + (title = case controller
+                when MEM_KEY then "#{controller} in kilobytes" 
+                when HEAP_KEY then "#{controller} in slots"
+                else "objects by #{labels[1]} in /#{controller}/"
+              end))
+              Analyze.new(action_data, increments, title).draw
+            end
+           
             # in each action, by object class
             action_data.keys.each do |action|
               action = "unknown" if action.to_s == ""
-              puts "    class for #{action} action"
-              Dir.descend(action) do
+              Dir.descend(@core ? "." : action) do
+                puts((@core ? "  " : "    ") + (title = "objects by class in #{@core ? CORE_KEY : "/#{controller}/#{action}"}"))
                 class_data, increments = aggregate(data, /^#{controller}#{"\/#{action}" unless action == "unknown"}($|\/|::::)/, 
                   /::::(.*)/)
-                Analyze.new(class_data, increments, "objects by class in /#{controller}/#{action}").draw
+                Analyze.new(class_data, increments, title).draw
               end
-            end unless @special
+            end unless @mem
           
           end          
         end

data/lib/bleak_house/bleak_house.rb

@@ -27,8 +27,6 @@ class BleakHouse
   end
   
   WITH_SPECIALS = false
-  GC = true
-
-  MEMLOGGER = CLogger.new
-    
+  
+  MEMLOGGER = CLogger.new    
 end

data/lib/bleak_house/c.rb

@@ -181,17 +181,21 @@ class BleakHouse
               }
             }
           }
-/*          fprintf(obj_log, \"    :\\"heap usage/ruby heaps\\": %i\\n", rb_gc_heaps_used()); */
           fprintf(obj_log, \"    :\\"heap usage/filled slots\\": %i\\n", filled_slots);
           fprintf(obj_log, \"    :\\"heap usage/free slots\\": %i\\n", free_slots);
           for (j = 0; j < current_pos; j++) {
             fprintf(obj_log, "    :\\"%s\\": %i\\n", tags[j], counts[j]);
           }
           fclose(obj_log);
+          
+          /* request GC run */          
+          rb_funcall(rb_mGC, rb_intern("start"), 0); 
+          /* to get a custom module: rb_const_get(parentModule, "ModuleName") 
+              parent module can be something like rb_mKernel for the toplevel */
           return Qtrue;
         }
       EOC
     end
 
   end
-end
+end

data/lib/bleak_house/dispatcher.rb

@@ -6,13 +6,11 @@ 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 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 if BleakHouse::GC
       reset_after_dispatch_without_bleak_house
     end
     alias_method_chain :reset_after_dispatch, :bleak_house

data/lib/bleak_house/gruff_hacks.rb

@@ -15,7 +15,7 @@ class Gruff::Base
     @legend_labels.each_with_index do |legend_label, index|      
 
       next if index > MAX_LEGENDS
-      legend_label = "Some not shown" if index == MAX_LEGENDS
+      legend_label = "some not shown" if index == MAX_LEGENDS
 
       # Draw label
       @d.fill = @font_color

data/tasks/bleak_house_tasks.rake

@@ -3,10 +3,12 @@ namespace :bleak_house do
   desc 'Analyze and chart all data'  
   task :analyze do    
     begin
-      gem 'gruff', '= 0.2.8'
+      gem 'gruff', '= 0.2.8' # fail early if gruff is missing
       require "#{File.dirname(__FILE__)}/../lib/bleak_house/analyze"
+      puts "loaded vendor/plugins version"
     rescue LoadError
       require 'bleak_house/analyze' 
+      puts "loaded gem version"
     end        
     BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.yaml.log")
   end  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "6"
-date: 2007-05-12 00:00:00 -04:00
+  version: "7"
+date: 2007-05-13 00:00:00 -07: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,17 +27,16 @@ signing_key:
 cert_chain: 
 post_install_message: |+
   
-  Thanks for installing Bleak House 6. 
+  Thanks for installing Bleak House 7. 
   
-  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 
-  the analyzer: 
+  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 the analyzer: 
   
     namespace :bleak_house do
       desc 'Analyze and chart all data'  
       task :analyze do    
-      rescue LoadError
-        end        
+        require 'bleak_house/analyze' 
         BleakHouse::Analyze.build_all("#{RAILS_ROOT}/log/bleak_house_#{RAILS_ENV}.yaml.log")
       end  
     end