deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Perf

Browse source
This commit is contained in:
Thomas Reynolds 2016-01-13 17:16:36 -08:00
parent c213bd19df
commit 5f8beba4b3
24 changed files with 361 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/sitemap/resource.rb
View file

@ -129,7 +129,7 @@ module Middleman
def render(opts={}, locs={})
return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template?
::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
# ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
md = metadata
opts = md[:options].deep_merge(opts)
locs = md[:locals].deep_merge(locs)
@ -140,7 +140,7 @@ module Middleman
renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
renderer.render(locs, opts)
end
# end
end
# A path without the directory index - so foo/index.html becomes

43
middleman-core/lib/middleman-core/sitemap/store.rb
View file

@ -75,6 +75,7 @@ module Middleman
def initialize(app)
@app = app
@resources = []
@rebuild_reasons = [:first_run]
@update_count = 0
@resource_list_manipulators = ::Hamster::Vector.empty
@ -115,9 +116,10 @@ module Middleman
# Rebuild the list of resources from scratch, using registed manipulators
# @return [void]
Contract Maybe[Symbol] => Any
def rebuild_resource_list!(name=nil)
Contract Symbol => Any
def rebuild_resource_list!(name)
@lock.synchronize do
@rebuild_reasons << name
@app.logger.debug "== Requesting resource list rebuilding: #{name}"
@needs_sitemap_rebuild = true
end
@ -198,29 +200,36 @@ module Middleman
def ensure_resource_list_updated!
@lock.synchronize do
return unless @needs_sitemap_rebuild
@needs_sitemap_rebuild = false
@app.logger.debug '== Rebuilding resource list'
::Middleman::Util.instrument "sitemap.update", reasons: @rebuild_reasons.uniq do
@needs_sitemap_rebuild = false
@resources = []
@app.logger.debug '== Rebuilding resource list'
@resource_list_manipulators.each do |m|
@app.logger.debug "== Running manipulator: #{m[:name]}"
@resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
@resources = []
# Reset lookup cache
reset_lookup_cache!
@resource_list_manipulators.each do |m|
::Middleman::Util.instrument "sitemap.manipulator", name: m[:name] do
@app.logger.debug "== Running manipulator: #{m[:name]}"
@resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
# Rebuild cache
@resources.each do |resource|
@_lookup_by_path[resource.path] = resource
@_lookup_by_destination_path[resource.destination_path] = resource
# Reset lookup cache
reset_lookup_cache!
# Rebuild cache
@resources.each do |resource|
@_lookup_by_path[resource.path] = resource
@_lookup_by_destination_path[resource.destination_path] = resource
end
invalidate_resources_not_ignored_cache!
end
end
invalidate_resources_not_ignored_cache!
end
@update_count += 1
@update_count += 1
@rebuild_reasons = []
end
end
end