railsprof 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd676c3941cfebbd315805ed26916b228d3851e2
-  data.tar.gz: 0e3a3adfd11b13be3370e992d4b3f97e6713527a
+  metadata.gz: 69f4db46ad80ecccc6865b388d9b0635e4fbfa1b
+  data.tar.gz: f9b8821aaf2a7d25283628678af859981ec0ad13
 SHA512:
-  metadata.gz: 94968394aacd9891748bc669235f6fea34760e08aef2fe7a56b02e3ed2f2c02a5b3085d95b13342c809c5af81dfb96bd94cd69d8408c15b7f1f3acd9c8c402ad
-  data.tar.gz: c6bb5b06f0b9928194699ef571c7dca8e8a22a8da3fe9b336465deee9e49bc40f3f5ab66749583fc73afcfd02ea75d049fec507022faaee0779871bb2e4b5d6f
+  metadata.gz: 05aadce244d50592ab86757ba849be1c442236c87abeda0e2aefc188de573989edba4862eb1e9520a190e5e92db61a38a2f7fa8ac472b40e64fbda784d743539
+  data.tar.gz: a2f0fd21ec88b697fad8182d9f4ee558f2514c3499643e8a30791c86b41a3dd000bfaf8b998b52a72c856f6ca9566f595ee6a575b96b8322c5cccc8662c43e69

data/lib/railsprof/lineprof_parser.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'pp'
 
 class Railsprof::LineprofParser
   # rblineprof formatting
@@ -13,20 +14,28 @@ class Railsprof::LineprofParser
   #     ...
   #   ]
   # }
+  attr_reader :logger, :options
 
-  def initialize(profile, paths, threshold_ms: 0.5)
+  def initialize(profile, paths, threshold_ms: 0.5, **options)
     @threshold = threshold_ms * 1000
     @paths = paths
     @profile = profile
     @friendly_paths = {}
     @profiled_source = {}
+    @logger = options[:logger]
+    @total_ms = options[:total_ms]
+    @options = options
 
     @profiled_files = profile
       .reduce([]) do |files, (file, lines)|
         total = lines[0][0]
         if total > @threshold # && !file[/benchmark|\.rake$/] # time in micros
           @friendly_paths[file] = @paths.relative_path_for(file)
-          files << [file, *lines[0]]
+          #     [total_time, child_time, excl_time, total_cpu, child_cpu, excl_cpu],
+          tt, _ct, _et, tc, _cc, _ec = lines[0]
+          # total, cpu, idle, exclusive %
+          file_timings = [tt, tc, tt - tc].map { |n| n / 1000.0 }
+          files << [file, *file_timings]
         end
         files
       end
@@ -34,11 +43,13 @@ class Railsprof::LineprofParser
   end
 
   def cli_report
-    puts "\n-- Top files by execution time (total / child / excl / filename) --\n"
+    spacing = 12
+    logger.info ''
+    logger.info(%W(total cpu idle).map { |s| s.ljust(spacing) }.join << " file")
 
-    @profiled_files.each do |file, total, child, excl|
-      printf "%9.2fms %9.2fms %9.2fms  %s\n" %
-        [total / 1000.0, child / 1000.0, excl / 1000.0, @friendly_paths[file]]
+    @profiled_files.each do |file, *timings|
+      str = timings.map { |t| ('%.1fms' % t).ljust(spacing) }.join
+      logger.info "#{str}  #{@friendly_paths[file]}"
     end
   end
 
@@ -57,6 +68,7 @@ class Railsprof::LineprofParser
     ERB.new(template, 0, "", "@html_output").result(b)
     File.open(filename, 'w') { |f| f.write(@html_output) }
 
+    logger.info "Results in #{filename}"
     `open #{filename}`
   end
 
@@ -66,6 +78,7 @@ class Railsprof::LineprofParser
     @profiled_source[file] = "\n % 8s   + % 8s   (called)\n" % %w(cpu idle)
     File.readlines(file).each_with_index do |line, num|
       wall, cpu, calls, _allocations = @profile[file][num + 1]
+      # excl cpu, excl idle, total cpu, total idle
       @profiled_source[file] <<
         if calls && calls > 0
           '% 8.1fms + % 8.1fms  % 8s | %s' %

data/lib/railsprof/profiler.rb

@@ -12,6 +12,7 @@ class Railsprof::Profiler
 
   def initialize(args, opts = {})
     @options = Railsprof::DEFAULT_OPTIONS.merge(opts)
+    @history = []
 
     @logger = options[:logger] || Railsprof::Logger.new(STDOUT)
     @logger.level = options[:log_level] || Logger::INFO
@@ -24,7 +25,7 @@ class Railsprof::Profiler
       args.first.upcase!
       @method, @path = args
     else
-      fail ArgumentError "excepted METHOD PATH, received: #{args.join(' ')}"
+      fail ArgumentError, "excepted METHOD PATH, received: #{args.join(' ')}"
     end
 
     logger.debug "Request: #@method #@path"
@@ -39,7 +40,7 @@ class Railsprof::Profiler
     if options[:runs] > 0
       logger.info 'Profiling....'
       
-      say_with_time('All profiles') do
+      total = say_with_time('All profiles') do
         @profile = lineprof(@paths.regexp) do
           options[:runs].times do |i|
             say_with_time("Profile ##{i + 1}") { run }
@@ -50,7 +51,15 @@ class Railsprof::Profiler
 
     parser = Railsprof::LineprofParser.new(
       @profile, @paths,
-      threshold_ms: options[:threshold]
+      threshold_ms: options[:threshold],
+      logger: logger,
+      profiler_options: @options.slice(*%i[
+        gems app_paths threshold cookies params session
+      ]),
+      history: @history,
+      method: @method,
+      path: @path,
+      total_ms: total
     )
 
     parser.cli_report
@@ -99,9 +108,9 @@ class Railsprof::Profiler
     env_file = Dir.pwd + '/config/environment.rb'
     if File.exists?(env_file)
       ms = Benchmark.ms { load env_file }
-      logger.info 'App loaded in %.2f secs' % (ms / 1000.0)
+      logger.info 'Loaded in %.2f secs (%s mode)' % [ms / 1000.0, Rails.env]
     else
-      puts 'Exiting... an application with config/environment.rb was expected'
+      logger.error 'Exiting... an application with config/environment.rb was expected'
       exit 1
     end
     @loaded = true
@@ -110,8 +119,10 @@ class Railsprof::Profiler
   def say_with_time(msg, level: 'info', &block)
     ret = nil
     ms = Benchmark.ms { ret = block.call }
-    logger.send(level, '%s completed in %.2fms' % [msg, ms])
-    ret
+    str = '%s completed in %.2fms' % [msg, ms]
+    logger.send(level, str)
+    @history << str
+    ms
   end
 end
 

data/lib/railsprof/version.rb

@@ -1,3 +1,3 @@
 module Railsprof
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/railsprof/views/railsprof-tmpl.html.erb

@@ -5,6 +5,17 @@
   <link href="http://clifton.is/css/normalize.css" rel="stylesheet" type="text/css">
   <link href="http://clifton.is/css/highlight.github.css" rel="stylesheet" type="text/css">
   <style>
+    * { box-sizing: border-box; }
+    .main { margin: 0 20px 50px; }
+    [double] {
+      margin: 0 0;
+      padding: 0 0;
+      font-size: 200%;
+    }
+    pre:first {
+      padding-top: 0;
+      margin 0 0;
+    }
     pre {
       overflow: auto;
       word-wrap: normal;
@@ -13,45 +24,53 @@
   </style>
 </head>
 <body>
-  <table>
-    <thead>
-      <tr>
-        <td width='120px'>Wall Total</td>
-        <td width='110px'>Wall Child</td>
-        <td width='110px'>Wall Excl</td>
-        <td width='90px'>CPU Total</td>
-        <td width='90px'>CPU Child</td>
-        <td width='90px'>CPU Excl</td>
-        <td>File</td>
-      </tr>
-    </thead>
-    <tbody>
-      <% @profiled_files.each do |file, *times| %>
+  <div class='main'>
+    <pre>
+<code double><%= @options.values_at(:method, :path).join(' ') %></code>
+<code class='ruby'>
+<%= @options[:profiler_options].map { |k, v| ":#{k.to_s.ljust(12)} #{v.inspect}" }.join("\n") %></code>
+<code>
+<%= @options[:history].join("\n") %></code>
+    </pre>
+    <table>
+      <thead>
         <tr>
-          <% times.each do |t| %>
-            <td><%= t / 1000.0 %></td>
-          <% end %>
-          <td>
-            <a href='#' class='js-toggle-code' data-file='<%= file %>'>
-              <%= @friendly_paths[file] %>
-            </a>
-          </td>
+          <td width='90px'>Total</td>
+          <td width='90px'>CPU</td>
+          <td width='90px'>Idle</td>
+          <td>File</td>
         </tr>
-        <tr style='display:none'>
-          <td colspan='7' style='overflow: auto'>
-            <br style='clear:both'>
-            <pre>
-              <code class="ruby"><%= @profiled_source[file] %></code>
-            </pre>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @profiled_files.each do |file, *timings| %>
+          <tr>
+            <% timings.each do |t| %>
+              <td><%= '%.1fms' % t %></td>
+            <% end %>
+            <td>
+              <a href='#' class='js-toggle-code' data-file='<%= file %>'>
+                <%= @friendly_paths[file] %>
+              </a>
+            </td>
+          </tr>
+          <tr style='display:none'>
+            <td colspan='7' style='overflow: auto'>
+              <br style='clear:both'>
+              <pre>
+                <code class="ruby"><%= @profiled_source[file] %></code>
+              </pre>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
   <script src='http://code.jquery.com/jquery-1.11.0.min.js'></script>
   <script src='http://clifton.is/js/highlight.js'></script>
   <script>
-    hljs.initHighlightingOnLoad();
+    $(function () {
+      $('.ruby').each(function(i, e) { hljs.highlightBlock(e, 'ruby') });
+    });
     $('.js-toggle-code').on('click', function () {
       $(this).parents('tr').next().toggle();
       return false;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railsprof
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Clifton King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler