(maint) Adds environment functions to function loading performance test

benchmarks/function_loading/benchmarker.rb

@@ -19,9 +19,10 @@ def setup
   end
 
   def run(args=nil)
-    env = Puppet.lookup(:environments).get("benchmarking#{benchmark_count}")
-    node = Puppet::Node.new("testing", :environment => env)
-    Puppet::Resource::Catalog.indirection.find("testing", :use_node => node)
+    envs = Puppet.lookup(:environments)
+    envs.clear('benchmarking')
+    node = Puppet::Node.new('testing', :environment => envs.get('benchmarking'))
+    Puppet::Resource::Catalog.indirection.find('testing', :use_node => node)
   end
 
   def benchmark_count
@@ -31,16 +32,13 @@ def benchmark_count
   end
 
   def generate
-    # We need a new environment for each iteration
-    ENV['ITERATIONS'].to_i.times { |c| generate_env(c) }
-  end
-
-  def generate_env(c)
-    environment = File.join(@target, 'environments', "benchmarking#{c}")
+    environment = File.join(@target, 'environments', 'benchmarking')
     modules = File.join(environment, 'modules')
+    env_functions = File.join(environment, 'lib', 'puppet', 'functions', 'environment')
     templates = File.join('benchmarks', 'function_loading')
 
     mkdir_p(modules)
+    mkdir_p(env_functions)
     mkdir_p(File.join(environment, 'manifests'))
 
     module_count = @size / 10
@@ -49,6 +47,9 @@ def generate_env(c)
            File.join(environment, 'manifests', 'site.pp'),
            :size => module_count)
 
+    env_function_template = File.join(templates, 'env_function.erb')
+    function_count.times { |n| render(env_function_template, File.join(env_functions, "f#{n}.rb"), :n => n) }
+
     module_count.times do |i|
       module_name = "module#{i}"
       module_base = File.join(modules, module_name)

benchmarks/function_loading/env_function.erb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'environment::f<%= n %>') do
+  def f<%= n %>
+    <% if n > 0 %>call_function(:'environment::f<%= n-1 %>')<% else %>'environment::f<%= n %>'<% end %>
+  end
+end

benchmarks/function_loading/puppet.conf.erb

@@ -1,4 +1,5 @@
 confdir = <%= location %>
 vardir = <%= location %>
 environmentpath = <%= File.join(location, 'environments') %>
+environment_timeout = 40s
 parser = future

benchmarks/function_loading/site.pp.erb

@@ -1,2 +1,4 @@
+environment::f999()
 <% size.times do |i| %>include module<%= i %>
 <% end %>
+