cafe-grader-web Commit - r315:faf1f66729ca

cafe-grader-web

Commit `r315:faf1f66729ca` public

parent | child

Description:

load test reads site_url from command line

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r315:faf1f66729ca - Sun, 20 Jun 2010 10:43:27 - 5 files changed: 26 inserted, 180 deleted

test/load/NOTES ¶ +1 -1

               How to call
               ===========
               Load test for front page:
-            -   ruby runner.rb common_visitors.rb FirstPageViewer 10 -t 10
+            +   ruby runner.rb common_visitors.rb FirstPageViewer 20 -t 10 --site_url=http://localhost/cafe

test/load/common_visitors.rb ¶ +5 -4

@@ -1,7 +1,8
1	- visitor "FirstPageViewer" do	1	+ if !defined? VISITOR_OPTION_LIST
2	- stores_cookies	2	+ VISITOR_OPTION_LIST = {}
		3	+ end
3		4
4	- site_url "http://localhost:3000"	5	+ visitor "FirstPageViewer", VISITOR_OPTION_LIST do
5	-	6	+ stores_cookies
6	get "/"	7	get "/"
7	end	8	end

test/load/runner.rb ¶ +12 -2

                     #puts "Waiting for thread #{i}, #{vthread[i].alive?}"
                     vthread[i].join
                   end
                 rescue Interrupt
                   # kill all remaining threads
                   vcount.times do |i|
                     vthread[i].kill if vthread[i].alive?
                   end
                 end
                 # clean up
                 visitors.each do |visitor|
                   #puts "Clean up: #{visitor.id}"
                   visitor.cleanup
                 end
                 #all_finish_time = Time.new
                 total_req = 0
                 vcount.times do |i|
                   stat = visitors[i].statistics
               #    puts "TYPE: #{visitors[i].class}"
               #    puts "Total requested = #{stat[:num_requested]}"
               #    puts "Average = #{stat[:avg_request_time]}"
               #    puts "S.D. = #{stat[:std_dev]}"
                   total_req += stat[:num_requested]
                 end
                 elapsed_time = all_finish_time - all_start_time
                 puts
                 puts "Total time = #{elapsed_time} sec."
                 puts "Total requests = #{total_req}"
                 puts "Trans. per sec = #{total_req/elapsed_time}"
               end
               ###########################
               # MAIN
               ###########################
               if ARGV.length==0
                 show_usage
                 exit(0)
               end
               visitor_file = ARGV.shift
-            - require visitor_file
               load_time = 60
               dry_run = false
-            - #build visitor list
+            + #build visitor/option list
               visitor_list = {}
+            + visitor_option_list = {}
               while ARGV.length>0
                 key = ARGV.shift
                 case key
                 when '-d'
                   dry_run = true
                 when '-t'
                   num = ARGV.shift.to_i
                   load_time = num
                 else
+            +     if key =~ /--(\w+)=(.*)/
+            +       # options
+            +       lm = Regexp.last_match
+            +       visitor_option_list[lm[1]] = lm[2]
+            +     else
+            +       # new visitor
                     num = ARGV.shift.to_i
                     visitor_list[key] = num
                   end
                 end
+            + end
+            +
+            + VISITOR_OPTION_LIST = visitor_option_list
+            + require visitor_file
               initialize_temp_dir
               runner visitor_list, load_time, {:dry_run => dry_run}

test/load/visitor_curl_cli.rb ¶ +8 -1

                     File.delete(@output_fname)
                     if FileTest.exists?(@output_fname)
                       # wait until system returns
                       sleep 1
                       trial += 1
                       break if trial>10
                     end
                   end
                 end
                 def self.site_url(url)
                   self.base_url = url
                 end
                 def self.stores_cookies
                   self.cookies_stored = true
                 end
                 def self.preprocess_param_hash(params)
                   return {} if params==nil
                   plist = {}
                   params.each do |key,val|
                     if key.is_a? Symbol
                       key_s = key.to_s
                     else
                       key_s = key
                     end
                     plist[key_s] = val
                   end
                   plist
                 end
                 def self.get(url,params=nil)
                   self.commands = [] if self.commands==nil
                   self.commands << {
                     :command => :get,
                     :url => url,
                     :params => Visitor.preprocess_param_hash(params) }
                 end
                 def self.post(url,params=nil,options=nil)
                   self.commands = [] if self.commands==nil
                   self.commands << { :command => :post,
                     :url => url,
                     :params => Visitor.preprocess_param_hash(params),
                     :options => options }
                 end
+            +   def self.process_options(options)
+            +     if options.has_key? "site_url"
+            +       self.base_url = options["site_url"]
+            +     end
+            +   end
+            +
                 def substitute_id(st)
                   return st if !(st.is_a? String)
                   st.gsub(/(()|(\$))\$\{id\}/) do |s|
                     if s=="${id}"
                       @id.to_s
                     else
                       "${id}"
                     end
                   end
                 end
                 def encode_params(params)
                   enc = ""
                   if params!=nil and params.length!=0
                     params.each do |key,val|
                       if enc != ""
                         enc += '&'
                       end
                       val = substitute_id(val)
                       enc += URI.escape(key) + '=' + URI.escape(val.to_s)
                     end
                   end
                   enc
                 end
                 def get(url,params)
                   #build url
                   #puts "----------------------cookies-----------"
                   #system("cat #{@cookies_fname}")
                   #puts "----------------------cookies-----------"
                   full_url = "#{self.class.base_url}#{url}"
                   if params!=nil and params.length!=0
                     full_url += '?' + encode_params(params)
                   end
                   cmd = "curl -k -b #{@cookies_fname} -D #{@cookies_fname} #{full_url} " +
                     " -s -L -o #{@output_fname}"
                   #puts ">>>>>>>>>>>>>>>>>> " + cmd
                   system(cmd)
                   #system("cat #{@output_fname}")
                 end
                 def post(url,params,options)
                   #puts "----------------------cookies-----------"
                   #system("cat #{@cookies_fname}")
                   #puts "----------------------cookies-----------"
                       break if @stopped
                       @statistics << {
                         :url => "#{cmd[:command]}:#{cmd[:url]}",
                         :time => finish_time - start_time }
                     end
                     times -= 1 if times.is_a? Integer    #otherwise, run forever
                     break if @stopped
                   end
                 end
                 def show_raw_stat
                   @statistics.each do |stat|
                     puts "#{stat[:url]} => #{stat[:time]}"
                   end
                 end
                 def statistics
                   num_requested = @statistics.length
                   totaltime = 0.0
                   @statistics.each { |stat| totaltime += stat[:time] }
                   if num_requested>0
                     average_request_time = totaltime / num_requested
                   else
                     average_request_time = 0
                   end
                   sq_sum = 0.0
                   @statistics.each do |stat|
                     sq_sum += (stat[:time]-average_request_time) ** 2
                   end
                   if num_requested>1
                     sd = Math.sqrt(sq_sum/(num_requested-1))
                   else
                     sd = 0
                   end
                   return {
                     :num_requested => num_requested,
                     :avg_request_time => average_request_time,
                     :std_dev => sd
                   }
                 end
               end
-            - def visitor(cname,&blk)
+            + def visitor(cname,options={},&blk)
                 c = Class.new(Visitor)
                 begin
                   Object.const_set(cname,c)
                 rescue NameError
                   puts <<ERROR
               Error on type #{cname}.
               Type name should be capitalized and follow Ruby constant naming rule.
               ERROR
                   exit(0)
                 end
+            +   c.process_options(options)
                 c.instance_eval(&blk)
               end

test/load/visitor.rb removed ¶ -172

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r315:faf1f66729ca - Sun, 20 Jun 2010 10:43:27 - 5 files changed: 26 inserted, 180 deleted

Sign in to your account

Commit r315:faf1f66729ca public

Author

r315:faf1f66729ca - Sun, 20 Jun 2010 10:43:27 - 5 files changed: 26 inserted, 180 deleted

Commit `r315:faf1f66729ca` public