YUKI Hiroshi
null+****@clear*****
Fri Jan 17 17:30:14 JST 2014
YUKI Hiroshi 2014-01-17 17:30:14 +0900 (Fri, 17 Jan 2014) New Revision: f42458e5fda3dd0f3cd3b3dd7bd88eb26e3dbad2 https://github.com/droonga/drnbench/commit/f42458e5fda3dd0f3cd3b3dd7bd88eb26e3dbad2 Message: Use generic name shuttle => request-reponse (reqrep) publish => publish-subscribe (pubsub) Modified files: README.md lib/drnbench.rb Renamed files: bin/drnbench-pubsub (from bin/drnbench-publish) bin/drnbench-reqrep (from bin/drnbench-shuttle) lib/drnbench/publish-subscribe/configuration.rb (from lib/drnbench/publish/configuration.rb) lib/drnbench/publish-subscribe/gradual-runner.rb (from lib/drnbench/publish/gradual-runner.rb) lib/drnbench/publish-subscribe/runner.rb (from lib/drnbench/publish/runner.rb) lib/drnbench/publish-subscribe/watch.rb (from lib/drnbench/publish/watch.rb) lib/drnbench/request-response/configuration.rb (from lib/drnbench/shuttle/configuration.rb) lib/drnbench/request-response/gradual-runner.rb (from lib/drnbench/shuttle/gradual-runner.rb) lib/drnbench/request-response/result.rb (from lib/drnbench/shuttle/result.rb) lib/drnbench/request-response/runner.rb (from lib/drnbench/shuttle/runner.rb) Modified: README.md (+7 -7) =================================================================== --- README.md 2014-01-17 16:47:57 +0900 (4c10f1a) +++ README.md 2014-01-17 17:30:14 +0900 (3bb1f67) @@ -18,8 +18,8 @@ So you'll be able to guess the limit performance of the throughput of a server, Drnbench provides two commands, for different styles of benchmarked servers. - * `drnbench-shuttle`: benchmarks simple request-response style APIs. - * `drnbench-publish`: benchmarks publish-subscribe style (including HTTP streaming) APIs. + * `drnbench-reqrep`: benchmarks simple request-response style APIs. + * `drnbench-pubsub`: benchmarks publish-subscribe style (including HTTP streaming) APIs. This command is not implemented yet. ## How to run benchmark? @@ -95,7 +95,7 @@ Drnbench will start multiple clients and send many requests based on the pattern 3. Run drnbench with the pattern file. # cd ~/drnbench - # RUBYLIB=lib/ bin/drnbench-shuttle \ + # RUBYLIB=lib/ bin/drnbench-reqrep \ --start-n-clients=1 \ --end-n-clients=32 \ --step=1 \ @@ -200,7 +200,7 @@ Drnbench will start multiple clients and send many requests based on the pattern 4. Run drnbench with the pattern file. # cd ~/drnbench - # RUBYLIB=lib/ bin/drnbench-shuttle \ + # RUBYLIB=lib/ bin/drnbench-reqrep \ --start-n-clients=1 \ --end-n-clients=32 \ --step=1 \ @@ -271,13 +271,13 @@ Steps to run: 3. Run drnbench with the pattern file. # cd ~/drnbench - # RUBYLIB=lib/ bin/drnbench-publish \ + # RUBYLIB=lib/ bin/drnbench-pubsub \ --start-n-subscribers=1000 \ --n-publishings=1000 \ --n-steps=10 \ --timeout=5 \ - --subscribe-request=/tmp/watch-subscribe.json \ - --feed=/tmp/watch-feed.json \ + --subscribe-request-file=/tmp/watch-subscribe.json \ + --feed-file=/tmp/watch-feed.json \ --protocol-adapter-port=80 \ --engine-config-path=/tmp/engine/ Renamed: bin/drnbench-pubsub (+6 -6) 90% =================================================================== --- bin/drnbench-publish 2014-01-17 16:47:57 +0900 (269c08e) +++ bin/drnbench-pubsub 2014-01-17 17:30:14 +0900 (2ec6653) @@ -4,7 +4,7 @@ require "drnbench" require "optparse" -config = Drnbench::Publish::Configuration.new +config = Drnbench::PublishSubscribe::Configuration.new option_parser = OptionParser.new do |parser| parser.on("--start-n-subscribers=N", Integer, "initial number of subscribers") do |n_subscribers| @@ -27,13 +27,13 @@ option_parser = OptionParser.new do |parser| config.output_path = output_path end - parser.on("--subscribe-request=PATH", String, + parser.on("--subscribe-request-file=PATH", String, "path to the file which defines a request to subscribe") do |path| - config.subscribe_request = path + config.subscribe_request_file = path end - parser.on("--feed=PATH", String, + parser.on("--feed-file=PATH", String, "path to the file which defines a message feeded to the engine") do |path| - config.feed = path + config.feed_file = path end parser.on("--protocol-adapter-port=PORT", Integer, @@ -76,7 +76,7 @@ args = option_parser.parse!(ARGV) config.validate -runner = Drnbench::Publish::GradualRunner.new(config) +runner = Drnbench::PublishSubscribe::GradualRunner.new(config) runner.run File.open(@config.output_path, "w") do |file| Renamed: bin/drnbench-reqrep (+2 -2) 94% =================================================================== --- bin/drnbench-shuttle 2014-01-17 16:47:57 +0900 (5069109) +++ bin/drnbench-reqrep 2014-01-17 17:30:14 +0900 (a52abe2) @@ -5,7 +5,7 @@ require "drnbench" require "optparse" require "json" -config = Drnbench::Shuttle::Configuration.new +config = Drnbench::RequestResponse::Configuration.new option_parser = OptionParser.new do |parser| parser.on("--duration=SECONDS", Float, "duration of the benmark") do |duration| @@ -66,7 +66,7 @@ args = option_parser.parse!(ARGV) config.validate -runner = Drnbench::Shuttle::GradualRunner.new(config) +runner = Drnbench::RequestResponse::GradualRunner.new(config) runner.run File.open(config.output_path, "w") do |file| Modified: lib/drnbench.rb (+6 -6) =================================================================== --- lib/drnbench.rb 2014-01-17 16:47:57 +0900 (ec309b3) +++ lib/drnbench.rb 2014-01-17 17:30:14 +0900 (ed62675) @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- require "drnbench/version" -require "drnbench/shuttle/configuration" -require "drnbench/shuttle/runner" -require "drnbench/shuttle/gradual-runner" -require "drnbench/publish/configuration" -require "drnbench/publish/runner" -require "drnbench/publish/gradual-runner" +require "drnbench/request-response/configuration" +require "drnbench/request-response/runner" +require "drnbench/request-response/gradual-runner" +require "drnbench/publish-subscribe/configuration" +require "drnbench/publish-subscribe/runner" +require "drnbench/publish-subscribe/gradual-runner" Renamed: lib/drnbench/publish-subscribe/configuration.rb (+2 -2) 94% =================================================================== --- lib/drnbench/publish/configuration.rb 2014-01-17 16:47:57 +0900 (d71c30f) +++ lib/drnbench/publish-subscribe/configuration.rb 2014-01-17 17:30:14 +0900 (3c071fa) @@ -1,7 +1,7 @@ require "drnbench/server/configuration" module Drnbench - module Publish + module PublishSubscribe class Configuration attr_accessor :start_n_subscribers, :n_publishings, :n_steps, :timeout attr_accessor :subscribe_request_file, :feed_file, :engine, :protocol_adapter @@ -14,7 +14,7 @@ module Drnbench @timeout = 10 @report_progressively = true - @output_path = "/tmp/drnbench-publish-result.csv" + @output_path = "/tmp/drnbench-pubsub-result.csv" @engine = Server::EngineConfiguration.new @protocol_adapter = Server::ProtocolAdapterConfiguration.new Renamed: lib/drnbench/publish-subscribe/gradual-runner.rb (+1 -1) 97% =================================================================== --- lib/drnbench/publish/gradual-runner.rb 2014-01-17 16:47:57 +0900 (da80dc5) +++ lib/drnbench/publish-subscribe/gradual-runner.rb 2014-01-17 17:30:14 +0900 (4bb5850) @@ -4,7 +4,7 @@ require "benchmark" require "csv" module Drnbench - module Publish + module PublishSubscribe class GradualRunner attr_reader :total_results Renamed: lib/drnbench/publish-subscribe/runner.rb (+1 -1) 98% =================================================================== --- lib/drnbench/publish/runner.rb 2014-01-17 16:47:57 +0900 (050a099) +++ lib/drnbench/publish-subscribe/runner.rb 2014-01-17 17:30:14 +0900 (115db68) @@ -8,7 +8,7 @@ require "drnbench/server/engine" require "drnbench/server/protocol-adapter" module Drnbench - module Publish + module PublishSubscribe class Runner attr_reader :n_subscribers Renamed: lib/drnbench/publish-subscribe/watch.rb (+1 -1) 94% =================================================================== --- lib/drnbench/publish/watch.rb 2014-01-17 16:47:57 +0900 (bba39cd) +++ lib/drnbench/publish-subscribe/watch.rb 2014-01-17 17:30:14 +0900 (54a967f) @@ -1,7 +1,7 @@ require "droonga/watch_schema" module Drnbench - module Publish + module PublishSubscribe class Watch class << self def command Renamed: lib/drnbench/request-response/configuration.rb (+1 -1) 98% =================================================================== --- lib/drnbench/shuttle/configuration.rb 2014-01-17 16:47:57 +0900 (34362a8) +++ lib/drnbench/request-response/configuration.rb 2014-01-17 17:30:14 +0900 (ff60d2f) @@ -1,5 +1,5 @@ module Drnbench - module Shuttle + module RequestResponse class Configuration attr_accessor :duration, :wait, :request_patterns_file attr_accessor :start_n_clients, :end_n_clients, :step, :n_requests Renamed: lib/drnbench/request-response/gradual-runner.rb (+2 -2) 96% =================================================================== --- lib/drnbench/shuttle/gradual-runner.rb 2014-01-17 16:47:57 +0900 (30b641a) +++ lib/drnbench/request-response/gradual-runner.rb 2014-01-17 17:30:14 +0900 (a163585) @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -require "drnbench/shuttle/runner" +require "drnbench/request-response/runner" require "csv" module Drnbench - module Shuttle + module RequestResponse class GradualRunner attr_reader :report_progressively, :result Renamed: lib/drnbench/request-response/result.rb (+1 -1) 99% =================================================================== --- lib/drnbench/shuttle/result.rb 2014-01-17 16:47:57 +0900 (a4b9ac5) +++ lib/drnbench/request-response/result.rb 2014-01-17 17:30:14 +0900 (a0ce0b0) @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- module Drnbench - module Shuttle + module RequestResponse class Result attr_reader :n_clients, :duration, :statuses Renamed: lib/drnbench/request-response/runner.rb (+2 -2) 97% =================================================================== --- lib/drnbench/shuttle/runner.rb 2014-01-17 16:47:57 +0900 (38bf07c) +++ lib/drnbench/request-response/runner.rb 2014-01-17 17:30:14 +0900 (be7dbef) @@ -2,10 +2,10 @@ require "drnbench/client/http" require "drnbench/client/http-droonga" -require "drnbench/shuttle/result" +require "drnbench/request-response/result" module Drnbench - module Shuttle + module RequestResponse class Runner attr_reader :n_clients, :result -------------- next part -------------- HTML����������������������������...Download