nchan_tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1dd4ceddaf522f6a4e493ac215a17b9989cec0a8412dd7df99798cf0261206b
-  data.tar.gz: 81988f661eaf53d32f06e1199f9508370c7fc65e481db90a23e81239fae10ffd
+  metadata.gz: 7ebb8bad8e4eab2ac6e0dafd8b93941d8001324158feadbd4638701d45b2ca0e
+  data.tar.gz: 89351ee1297b3b3bc01535e5da7a8fb2795ce16c0f3da3a7b1a5b89c2d6f4dcf
 SHA512:
-  metadata.gz: 412ea567add374cc898383500193ca1b4fee644389777db3fe571561dc368f21256859e6266d54aba0fd332994036313ba3d62d44d79057c889bcac3b407912a
-  data.tar.gz: 4503fe9cacadf0c6baafd2a44f15fd3891540c3378cb2893c2844f3260a9766c4d216b93d6ff1f0be335936dc9b805725af290e70a3fa36ba4db2c1c48414ae2
+  metadata.gz: 5cf14c247f20f07962a1087f6f9adf509576dc6e0b9d6e9285ce30401847c038d5ab072bd259271cac48212ebcdf571283a52e30ee79fabf0e3bd884e801a50c
+  data.tar.gz: 7dc9a2ad487a014212fa27b936f5bab403f428403eb22bbede56705d17dbfc44daff7b30005b82fe6dfb2289cdb1b9a8857473290e5011584f7e565c556f4e5e

data/exe/nchan-benchmark

@@ -11,6 +11,8 @@ require "HDRHistogram"
 verbose = false
 save_csv = false
 
+init_args = {}
+
 opt_parser=OptionParser.new do |opts|
   opts.on("-v", "--verbose", "somewhat rather extraneously wordful output") do
     verbose = true
@@ -18,9 +20,23 @@ opt_parser=OptionParser.new do |opts|
   opts.on("--csv FILENAME", "Append results to file in CSV format") do |f|
     save_csv = f
   end
-  
+  opts.on("-t", "--time TIME", "Time to run benchmark") do |v|
+    init_args[:time] = v
+  end
+  opts.on("-r", "--msgrate NUMBER", "Message publishing rate per minute per channel") do |v|
+    init_args[:messages_per_channel_per_minute] = v
+  end
+  opts.on("-p", "--msgpadding NUMBER", "Message padding, in bytes") do |v|
+    init_args[:message_padding_bytes] = v
+  end
+  opts.on("-c", "--channels NUMBER", "Number of channels") do |v|
+    init_args[:channels] = v
+  end
+  opts.on("-s", "--subscribers NUMBER", "Subscribers per channel") do |v|
+    init_args[:subscribers_per_channel] = v
+  end
 end
-opt_parser.banner="Usage: benchan.rb [options] url1 url2 url3..."
+opt_parser.banner="Usage: nchan-benchmark [options] url1 url2 url3..."
 opt_parser.parse!
 
 urls = []
@@ -33,7 +49,9 @@ end
 urls.uniq!
 
 class Benchan
-  def initialize(urls)
+  class BenchmarkError < StandardError
+  end
+  def initialize(urls, init_args=nil)
     @urls = urls
     @n = urls.count
     @initializing = 0
@@ -44,6 +62,8 @@ class Benchan
     @results = {}
     @failed = {}
     
+    @init_args = init_args
+    
     @hdrh_publish = nil
     @hdrh_receive = nil
     
@@ -66,14 +86,14 @@ class Benchan
       sub.on_message do |msg|
         msg = msg.to_s
         case msg
-        when "READY"
+        when /^READY/
           puts   "  #{sub.url} ok"
           @ready +=1
           if @ready == @n
             control :run
             puts "start benchmark..."
           end
-        when "RUNNING"
+        when /^RUNNING/
           puts   "  #{sub.url} running"
         when /^RESULTS\n/
           msg = msg[8..-1]
@@ -81,9 +101,10 @@ class Benchan
           @results[sub.url] = parsed
           @results[sub.url]["raw"] = msg if @results[sub.url]
           1+1
+        when /^INITIALIZING/
+          #do nothing
         else
-          binding.pry
-          1+1
+          raise BenchmarkError, "unexpected server response: #{msg}"
         end
       end
       @subs << sub
@@ -97,7 +118,7 @@ class Benchan
     end
     return if @failed.count > 0
     puts "initializing benchmark..."
-    control :initialize
+    control :init
     self.wait
     puts "finished."
     puts ""
@@ -108,6 +129,9 @@ class Benchan
   end
   
   def control(msg)
+    if @init_args && (msg.to_sym ==:init || msg.to_sym ==:initialize)
+      msg = "#{msg.to_s} #{@init_args.map{|k,v| "#{k}=#{v}"}.join(" ")}"
+    end
     @subs.each { |sub| sub.client.send_data msg.to_s }
   end
   
@@ -237,7 +261,7 @@ class Benchan
   end
 end
 
-benchan = Benchan.new urls
+benchan = Benchan.new urls, init_args
 benchan.run
 benchan.results
 benchan.append_csv_file(save_csv) if save_csv

data/lib/nchan_tools/pubsub.rb

@@ -248,7 +248,7 @@ class Subscriber
     end
   end
   
-  class SubscriberError < Exception
+  class SubscriberError < StandardError
   end
   class Client
     attr_accessor :concurrency
@@ -1646,7 +1646,7 @@ end
 class Publisher
   #include Celluloid
   
-  class PublisherError < Exception
+  class PublisherError < StandardError
   end
   
   attr_accessor :messages, :response, :response_code, :response_body, :nofail, :accept, :url, :extra_headers, :verbose, :ws, :channel_info, :channel_info_type

data/lib/nchan_tools/version.rb

@@ -1,3 +1,3 @@
 module NchanTools
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nchan_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Leo Ponomarev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus