derailed_benchmarks 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d0d07556d2d6676ea8b2c06d58583071fd9302c056d36db05d252480889308
-  data.tar.gz: 0c783db16c1612173975c12760b101fc30cbd5765d296b2fd66506992305ac69
+  metadata.gz: c0f29e3b52bfe2c3c549a9908cf835ec63430afc8d8c733f8ccbf73646b0aa07
+  data.tar.gz: c43b9cc6602884bc33c3e6479b75250564ef4b54f895b87a6d0b5f79f4469704
 SHA512:
-  metadata.gz: e37aa667a5fe031a384a343de999a34ef9f1e0ba98f8190d6f86d326ee30f968e3555344fbaf8841f99da85354c2b4383fe1b75ab166eb0df9134d20ee48fd95
-  data.tar.gz: 3f581637e835d808b8264786ffd70159fe534c4147e72e65f5649fe7ecb0b92b9edc215c9edd43e2ca51a510793ae475da3e0318262103bb741823746d9f3421
+  metadata.gz: 23583aa213f4f2ddb8ead5c9325972bd8fc696289303e16faf34023e5f732288d51cd9d5fe9edb0f37a44c0a1f3ebbe32d74c6355ba85b4f9dd1793e8e3359d5
+  data.tar.gz: f4074b2f83fd12c4b81e4f9714bae62a0ed15e012d2a4a821d2c038fc537b9b511475482e4928d689421ba473cfb91543431866d1cd424cf6db101b792bcfdb8

data/Appraisals

@@ -1,26 +1,26 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-appraise "rails-3-2" do
-  gem "rails", "~> 3.2.0"
-end
+# appraise "rails-3-2" do
+#   gem "rails", "~> 3.2.0"
+# end
 
-appraise "rails-4-0" do
-  gem "rails", "~> 4.0.0"
-end
+# appraise "rails-4-0" do
+#   gem "rails", "~> 4.0.0"
+# end
 
-appraise "rails-4-1" do
-  gem "rails", "~> 4.1.0"
-end
+# appraise "rails-4-1" do
+#   gem "rails", "~> 4.1.0"
+# end
 
-appraise "rails-4-2" do
-  gem "rails", "~> 4.2.0"
-end
+# appraise "rails-4-2" do
+#   gem "rails", "~> 4.2.0"
+# end
 
-appraise "rails-5-0" do
-  gem "rails", "~> 5.0.0"
-end
+# appraise "rails-5-0" do
+#   gem "rails", "~> 5.0.0"
+# end
 
 appraise "rails-5-1" do
-  gem "rails", "~> 5.1.0"
+  gem "rails", "~> 5.1.7"
 end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## HEAD
 
+## 1.8.1
+
+- Derailed now tracks memory use from `load` in addition to `require` (https://github.com/schneems/derailed_benchmarks/pull/178)
+- Correct logging of unsuccessful curl requests to file (https://github.com/schneems/derailed_benchmarks/pull/172)
+
 ## 1.8.0
 
 - Ruby 2.2 is now officialy supported and tested (https://github.com/schneems/derailed_benchmarks/pull/177)

data/gemfiles/rails_5_1.gemfile

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+#  BUNDLE_GEMFILE="gemfiles/rails_5_1.gemfile" bundle exec m test/integration/tasks_test.rb:30
+#
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 5.1.7"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/gemfiles/rails_5_2.gemfile

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
+#
+# BUNDLE_GEMFILE="gemfiles/rails_5_2.gemfile" bundle exec m test/integration/tasks_test.rb:30
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 5.2.4.4"
 
 group :development, :test do
   gem "sqlite3", platform: [:ruby, :mswin, :mingw]

data/lib/derailed_benchmarks/core_ext/kernel_require.rb

@@ -17,12 +17,16 @@ module Kernel
 
   alias_method :original_require, :require
   alias_method :original_require_relative, :require_relative
+  alias_method(:original_load, :load)
+
+  def load(file, wrap = false)
+    measure_memory_impact(file) do |file|
+      original_load(file)
+    end
+  end
 
   def require(file)
     measure_memory_impact(file) do |file|
-      # "source_annotation_extractor" is deprecated in Rails 6
-      # # if we don't skip the library it leads to a crash
-      # next if file == "rails/source_annotation_extractor" && Rails.version >= '6.0'
       original_require(file)
     end
   end
@@ -67,22 +71,29 @@ module Kernel
   end
 end
 
-# Top level node that will store all require information for the entire app
-TOP_REQUIRE = DerailedBenchmarks::RequireTree.new("TOP")
-REQUIRE_STACK.push(TOP_REQUIRE)
 
+# I honestly have no idea why this Object delegation is needed
+# I keep staring at bootsnap and it doesn't have to do this
+# is there a bug in their implementation they haven't caught or
+# am I doing something different?
 class Object
   private
+  def load(path, wrap = false)
+    Kernel.load(path, wrap)
+  end
 
   def require(path)
     Kernel.require(path)
   end
 end
 
-# Don't forget to assign a cost to the top level
-cost_before_requiring_anything = GetProcessMem.new.mb
-TOP_REQUIRE.cost = cost_before_requiring_anything
+# Top level node that will store all require information for the entire app
+TOP_REQUIRE = DerailedBenchmarks::RequireTree.new("TOP")
+REQUIRE_STACK.push(TOP_REQUIRE)
+TOP_REQUIRE.cost = GetProcessMem.new.mb
+
 def TOP_REQUIRE.print_sorted_children(*args)
   self.cost = GetProcessMem.new.mb - self.cost
   super
 end
+

data/lib/derailed_benchmarks/load_tasks.rb

@@ -110,7 +110,7 @@ namespace :perf do
           STDERR.puts "Bad request to #{cmd.inspect} \n\n***RESPONSE***:\n\n#{ response.inspect }"
 
           FileUtils.mkdir_p("tmp")
-          File.open("tmp/fail.html", "w+") {|f| f.write response.body }
+          File.open("tmp/fail.html", "w+") {|f| f.write response }
 
           `open #{File.expand_path("tmp/fail.html")}` if ENV["DERAILED_DEBUG"]
 

data/lib/derailed_benchmarks/require_tree.rb

@@ -13,6 +13,16 @@ module DerailedBenchmarks
     def initialize(name)
       @name     = name
       @children = {}
+      @cost = 0
+    end
+
+    def self.reset!
+      REQUIRED_BY.clear
+      if defined?(Kernel::REQUIRE_STACK)
+        Kernel::REQUIRE_STACK.clear
+
+        Kernel::REQUIRE_STACK.push(TOP_REQUIRE)
+      end
     end
 
     def <<(tree)

data/lib/derailed_benchmarks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DerailedBenchmarks
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/test/derailed_benchmarks/core_ext/kernel_require_test.rb

@@ -3,7 +3,6 @@
 require 'test_helper'
 
 class KernelRequireTest < ActiveSupport::TestCase
-
   setup do
     require 'derailed_benchmarks/core_ext/kernel_require'
     GC.disable
@@ -11,23 +10,83 @@ class KernelRequireTest < ActiveSupport::TestCase
 
   teardown do
     GC.enable
+    DerailedBenchmarks::RequireTree.reset!
+  end
+
+  test "profiles load" do
+    in_fork do
+      require fixtures_dir("require/load_parent.rb")
+
+      parent = assert_node_in_parent("load_parent.rb", TOP_REQUIRE)
+
+      assert_node_in_parent("load_child.rb", parent)
+    end
+  end
+
+  test "profiles autoload" do
+    skip if RUBY_VERSION.start_with?("2.2") # Fails on CI, I can't install Ruby 2.2 locally to debug https://stackoverflow.com/questions/63926460/install-ruby-2-2-on-mac-osx-catalina-with-ruby-install, https://github.com/postmodern/ruby-install/issues/375
+
+    in_fork do
+      require fixtures_dir("require/autoload_parent.rb")
+      parent = assert_node_in_parent("autoload_parent.rb", TOP_REQUIRE)
+
+      assert_node_in_parent("autoload_child.rb", parent)
+    end
   end
 
+  test "core extension profiles useage" do
+    in_fork do
+      require fixtures_dir("require/parent_one.rb")
+      parent    = assert_node_in_parent("parent_one.rb", TOP_REQUIRE)
+      assert_node_in_parent("child_one.rb", parent)
+      child_two = assert_node_in_parent("child_two.rb", parent)
+      assert_node_in_parent("relative_child", parent)
+      assert_node_in_parent("relative_child_two", parent)
+      assert_node_in_parent("raise_child.rb", child_two)
+    end
+  end
+
+  # Checks to see that the given file name is present in the
+  # parent tree node and that the memory of that file
+  # is less than the parent (since the parent should include itself
+  # plus its children)
+  #
+  # Returns the child node
   def assert_node_in_parent(file_name, parent)
     file = fixtures_dir(File.join("require", file_name))
     node = parent[file]
-    assert node,                    "Expected:\n#{parent.children}\nto include:\n#{file.inspect}"
-    assert node.cost < parent.cost, "Expected:\n#{node.inspect}\nto cost less than:\n#{parent.inspect}" unless parent == TOP_REQUIRE
+    assert node, "Expected: #{parent.name} to include: #{file.to_s} but it did not.\nChildren: #{parent.children.map(&:name).map(&:to_s)}"
+    unless parent == TOP_REQUIRE
+      assert node.cost < parent.cost, "Expected: #{node.name.inspect} (#{node.cost}) to cost less than: #{parent.name.inspect} (#{parent.cost})"
+    end
     node
   end
 
-  test "core extension profiles useage" do
-    require fixtures_dir("require/parent_one.rb")
-    parent    = assert_node_in_parent("parent_one.rb", TOP_REQUIRE)
-    assert_node_in_parent("child_one.rb", parent)
-    child_two = assert_node_in_parent("child_two.rb", parent)
-    assert_node_in_parent("relative_child", parent)
-    assert_node_in_parent("relative_child_two", parent)
-    assert_node_in_parent("raise_child.rb", child_two)
+  # Used to get semi-clean process memory
+  # It would be better to run the requires in a totally different process
+  # but...that would take engineering
+  #
+  # If I was going to do that, I would find a way to serialize RequireTree
+  # into a json structure with file names and costs, run the script
+  # dump the json to a file, then in this process read the file and
+  # run assertions
+  def in_fork
+    Tempfile.create("stdout") do |tmp_file|
+      pid = fork do
+        $stdout.reopen(tmp_file, "w")
+        $stderr.reopen(tmp_file, "w")
+        $stdout.sync = true
+        $stderr.sync = true
+        yield
+        Kernel.exit!(0) # needed for https://github.com/seattlerb/minitest/pull/683
+      end
+      Process.waitpid(pid)
+
+      if $?.success?
+        print File.read(tmp_file)
+      else
+        raise File.read(tmp_file)
+      end
+    end
   end
 end

data/test/derailed_benchmarks/require_tree_test.rb

@@ -9,7 +9,7 @@ class RequireTree < ActiveSupport::TestCase
   end
 
   def teardown
-    DerailedBenchmarks::RequireTree.const_set("REQUIRED_BY",  {})
+    DerailedBenchmarks::RequireTree.reset!
   end
 
   test "default_cost" do

data/test/fixtures/require/autoload_child.rb

@@ -0,0 +1,5 @@
+@retained = String.new("")
+1_000_000.times.map { @retained << "A" }
+
+module AutoLoadChild
+end

data/test/fixtures/require/autoload_parent.rb

@@ -0,0 +1,8 @@
+@retained = String.new("")
+1_000_000.times.map { @retained << "A" }
+
+autoload :AutoLoadChild, File.join(__dir__, 'autoload_child.rb')
+
+if AutoLoadChild
+  # yay
+end

data/test/fixtures/require/load_child.rb

@@ -0,0 +1,3 @@
+@retained = String.new("")
+1_000_000.times.map { @retained << "A" }
+

data/test/fixtures/require/load_parent.rb

@@ -0,0 +1,5 @@
+@retained = String.new("")
+1_000_000.times.map { @retained << "A" }
+
+load File.join(__dir__, "load_child.rb")
+

data/test/test_helper.rb

@@ -51,7 +51,6 @@ class ActiveSupport::IntegrationCase
   end
 end
 
-
 def fixtures_dir(name = "")
   root_path("test/fixtures").join(name)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: derailed_benchmarks
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Richard Schneeman
@@ -272,8 +272,12 @@ files:
 - test/derailed_benchmarks/require_tree_test.rb
 - test/derailed_benchmarks/stats_from_dir_test.rb
 - test/derailed_test.rb
+- test/fixtures/require/autoload_child.rb
+- test/fixtures/require/autoload_parent.rb
 - test/fixtures/require/child_one.rb
 - test/fixtures/require/child_two.rb
+- test/fixtures/require/load_child.rb
+- test/fixtures/require/load_parent.rb
 - test/fixtures/require/parent_one.rb
 - test/fixtures/require/raise_child.rb
 - test/fixtures/require/relative_child.rb
@@ -358,8 +362,12 @@ test_files:
 - test/derailed_benchmarks/require_tree_test.rb
 - test/derailed_benchmarks/stats_from_dir_test.rb
 - test/derailed_test.rb
+- test/fixtures/require/autoload_child.rb
+- test/fixtures/require/autoload_parent.rb
 - test/fixtures/require/child_one.rb
 - test/fixtures/require/child_two.rb
+- test/fixtures/require/load_child.rb
+- test/fixtures/require/load_parent.rb
 - test/fixtures/require/parent_one.rb
 - test/fixtures/require/raise_child.rb
 - test/fixtures/require/relative_child.rb