Changeset 1016
- Timestamp:
- 11/17/07 13:01:44 (11 months ago)
- Files:
-
- apps/benchmark/app/controllers/perf.rb (modified) (1 diff)
- apps/benchmark/script/benchmark (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
apps/benchmark/app/controllers/perf.rb
r992 r1016 6 6 7 7 def simple_template 8 render :layout => :none 9 end 10 11 def with_layout 8 12 render 9 13 end apps/benchmark/script/benchmark
r1011 r1016 6 6 err.puts "* Starting Merb" 7 7 ENV["EVENT"] = "1" 8 ` merb -d -e production`8 `env EVENT=1 merb -d -e production` 9 9 pid = File.read("#{File.dirname(__FILE__)}/../log/merb.4000.pid") 10 10 sleep 5 11 11 ps = `ps aux #{pid}` 12 12 memsize = (ps.split("\n")[1].split[5].to_f / 10.24).round / 100.0 … … 15 15 16 16 TIMES = ARGV.find{|x| x =~ /^-t/ }[2..-1].to_i rescue 1000 17 CNCRC = ARGV.find{|x| x =~ /^-c/ }[2..-1].to_i rescue 5 17 CNCRC = ARGV.find{|x| x =~ /^-c/ }[2..-1].to_i rescue 1 18 18 19 19 20 def call_ab(msg, url) … … 54 55 55 56 sleep 1 57 58 put_header_message("Static files") 59 call_ab("Serve Static File", "hello.txt") 56 60 57 61 put_header_message("Templates and Partials")
