@@ -144,8 +144,8 @@ class RamazeBenchmark
end
attr_accessor :requests, :adapters, :port, :log, :display_code, :target
- attr_accessor :concurrent, :paths, :benchmarker, :informer, :sessions
- attr_accessor :show_log, :formats
+ attr_accessor :concurrent, :paths, :benchmarker, :informer
+ attr_accessor :mode, :show_log, :formats
def initialize()
@adapters = [:webrick]
@@ -159,6 +159,7 @@ class RamazeBenchmark
@informer = true
@formats = ["text"]
@writers = []
+ @mode = :live
yield self
end
@@ -245,7 +246,8 @@ class RamazeBenchmark
def ramaze(filename, adapter)
pid = fork do
begin
- require filename
+ require 'ramaze'
+ Ramaze.options.mode = @mode
if @informer
unless @show_log
require 'ramaze/log/informer'
@@ -254,6 +256,7 @@ class RamazeBenchmark
else
Ramaze::Log.loggers = []
end
+ require filename
Ramaze.start :adapter => adapter, :port => @port
rescue LoadError => ex; l :Error, ex; end
end
@@ -319,6 +322,10 @@ RamazeBenchmark.new do |bm|
bm.paths = paths.split(",")
end
+ opt.on('--mode MODE', '[live] Ramaze mode') do |mode|
+ bm.mode = mode.to_sym
+ end
+
opt.on('--no-informer', 'Disable informer') do
bm.informer = false
end
@@ -327,10 +334,6 @@ RamazeBenchmark.new do |bm|
bm.show_log = true
end
- opt.on('--no-sessions', 'Disable sessions') do
- bm.sessions = false
- end
-
opt.on('--target REGEXP',
'[/.+/] Specify benchmark scripts to measure') do |name|
bm.target = Regexp.compile(name)
benchmark/run.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :None
benchmark/suite/minimal.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
def index
"Hello, World!"
benchmark/suite/no_informer.rb
@@ -1,11 +1,9 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
def index
"Hello, World!"
end
end
-Ramaze.middleware!(:live){|m| m.run(Ramaze::AppMap) }
-Ramaze.options.mode = :live
+Ramaze.middleware!(:nosessions){|m| m.run(Ramaze::AppMap) }
+Ramaze.options.mode = :nosessions
Ramaze::Log.loggers.clear
benchmark/suite/no_sessions.rb
@@ -1,9 +1,7 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :None
def index
"Hello, World!"
end
-end
\ No newline at end of file
+end
benchmark/suite/no_template.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
def index
"Hello, World!"
benchmark/suite/simple.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Erubis
benchmark/suite/template_erubis.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Etanni
@@ -8,5 +6,3 @@ class MainController < Ramaze::Controller
'<html><body><?r 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
end
end
-
-Ramaze.start
benchmark/suite/template_etanni.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Ezamar
benchmark/suite/template_ezamar.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Haml
benchmark/suite/template_haml.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Liquid
benchmark/suite/template_liquid.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Markaby
helper :markaby
benchmark/suite/template_markaby.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Nagoro
benchmark/suite/template_nagoro.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :RedCloth
layout :layout
benchmark/suite/template_redcloth.rb
@@ -1,5 +1,3 @@
-require 'ramaze'
-
class MainController < Ramaze::Controller
engine :Tenjin
benchmark/suite/template_tenjin.rb
b8337e93765d45dc17b08cad8a742610dfd7fb8f
Andreas Karlsson
andreas@proxel.se
http://github.com/manveru/ramaze/commit/1d9215a7ee0f8619e87922d4e55d5390932dc5f4
1d9215a7ee0f8619e87922d4e55d5390932dc5f4
2009-05-05T08:35:40-07:00
2009-05-03T12:10:44-07:00
Clean up benchmarking.
Clean up benchmarking a bit adding support for a mode switch,
which defaults to "live". Move "require 'ramaze'" to support
custom environments and killing the logging correctly.
Also fix bug where Ramaze.start was run in one of the files
in the suite, and finally remove the unused --no-sessions.
Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
120777d958cb4939312c0e13b4cf0fd99c3e5772
Michael Fellinger
m.fellinger@gmail.com