nchan_tools 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6f6c40e0e15751d878e26903dd3c9812919069b8f338e0463529e836c69ae2
-  data.tar.gz: 41b7845122c2ef1792f03f8bdb9533276c2fb5b7507d53ac670b05f3eebbf2cd
+  metadata.gz: fc307ac259708a9a1179d17d2faeb4bf4ae9942b9f98560aac6272d849500b6f
+  data.tar.gz: e93c9a63ec00ea307fb80ed6b0ccfd8e174099a6fd588a53cffd3bb2147dbce8
 SHA512:
-  metadata.gz: 34eb95c4a0ff0c54018ec9a1671880816582a3a7c3e3b0d1eca69c64349d78c119f5bec9daf240266ef3f1c6b4c04359bc3b7ee0cef746be1bfd881b210d7298
-  data.tar.gz: be8316e86a2b32d411fb485d73658071e713dfad3396d75f649852d2158e7b1f85b40a0bce4e6d12ac296c000886ac5c518369b52f5131270fe14a40db66ca03
+  metadata.gz: 4d2dc2bdf4e8fc50f506453433a780b8428d66cbe0c3e9cb066198fed262abb3920d37d76d58b1d95c185f7eb0d5cb54161a1a7a9a20a8043c4a22a82bb37d6f
+  data.tar.gz: 5240f7aaf08af1cad360f07c43eba880bed7840aa547535d9562ce55f9f262d2e552e3e19a28aae3bb57a17e816c69f49f46ee94a5ec33efdfc4344ae8101b4f

data/exe/nchan-benchmark

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'securerandom'
-require 'nchan_tools/pubsub'
+require 'nchan_tools/benchmark'
 require "optparse"
 require 'timers'
 require 'json'
@@ -47,220 +47,7 @@ end
 
 urls.uniq!
 
-class Benchan
-  class BenchmarkError < StandardError
-  end
-  def initialize(urls, init_args=nil)
-    @urls = urls
-    @n = urls.count
-    @initializing = 0
-    @ready = 0
-    @running = 0
-    @finished = 0
-    @subs = []
-    @results = {}
-    @failed = {}
-    
-    @init_args = init_args
-    
-    @hdrh_publish = nil
-    @hdrh_receive = nil
-    
-    subs = []
-  end
-  
-  def run
-    puts "connecting to #{@n} Nchan server#{@n > 1 ? "s" : ""}..."
-    @urls.each do |url|
-      sub = Subscriber.new(url, 1, client: :websocket, timeout: 900000, extra_headers: {"Accept" => "text/x-json-hdrhistogram"})
-      sub.on_failure do |err|
-        unless @results[sub]
-          unless @results[sub.url]
-            @failed[sub] = true
-            abort err, sub
-          end
-        end
-        false
-      end
-      sub.on_message do |msg|
-        msg = msg.to_s
-        case msg
-        when /^READY/
-          puts   "  #{sub.url} ok"
-          @ready +=1
-          if @ready == @n
-            control :run
-            puts "start benchmark..."
-          end
-        when /^RUNNING/
-          puts   "  #{sub.url} running"
-        when /^RESULTS\n/
-          msg = msg[8..-1]
-          parsed = JSON.parse msg
-          @results[sub.url] = parsed
-          @results[sub.url]["raw"] = msg if @results[sub.url]
-          1+1
-        when /^INITIALIZING/
-          #do nothing
-        else
-          raise BenchmarkError, "unexpected server response: #{msg}"
-        end
-      end
-      @subs << sub
-      sub.run
-      sub.wait :ready, 1
-      if @failed[sub]
-        puts "  #{sub.url} failed"
-      else
-        puts "  #{sub.url} ok"
-      end
-    end
-    return if @failed.count > 0
-    puts "initializing benchmark..."
-    control :init
-    self.wait
-    puts "finished."
-    puts ""
-  end
-  
-  def wait
-    @subs.each &:wait
-  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
-  
-  def abort(err, src_sub = nil)
-    puts "  #{err}"
-    @subs.each do |sub|
-      sub.terminate unless sub == src_sub
-    end
-  end
-  
-  def hdrhistogram_stats(name, histogram)
-    fmt = <<-END.gsub(/^ {6}/, '')
-      %s
-        min:                         %.3fms
-        avg:                         %.3fms
-        99%%ile:                      %.3fms
-        max:                         %.3fms
-        stddev:                      %.3fms
-        samples:                     %d
-    END
-    fmt % [ name,
-      histogram.min, histogram.mean, histogram.percentile(99.0), histogram.max, histogram.stddev, histogram.count
-    ]
-  end
-  
-  def results
-    @channels = 0
-    @runtime = []
-    @subscribers = 0
-    @message_length = []
-    @messages_sent = 0
-    @messages_send_confirmed = 0
-    @messages_send_unconfirmed = 0
-    @messages_send_failed = 0
-    @messages_received = 0
-    @messages_unreceived = 0
-    @hdrh_publish = nil
-    @hdrh_receive = nil
-    @results.each do |url, data|
-      @channels += data["channels"]
-      @runtime << data["run_time_sec"]
-      @subscribers += data["subscribers"]
-      @message_length << data["message_length"]
-      @messages_sent += data["messages"]["sent"]
-      @messages_send_confirmed += data["messages"]["send_confirmed"]
-      @messages_send_unconfirmed += data["messages"]["send_unconfirmed"]
-      @messages_send_failed += data["messages"]["send_failed"]
-      @messages_received += data["messages"]["received"]
-      @messages_unreceived += data["messages"]["unreceived"]
-      
-      if data["message_publishing_histogram"]
-        hdrh = HDRHistogram.unserialize(data["message_publishing_histogram"], unit: :ms, multiplier: 0.001)
-        if @hdrh_publish
-          @hdrh_publish.merge! hdrh
-        else
-          @hdrh_publish = hdrh
-        end
-      end
-      if data["message_delivery_histogram"]
-        hdrh = HDRHistogram.unserialize(data["message_delivery_histogram"], unit: :ms, multiplier: 0.001)
-        if @hdrh_receive
-          @hdrh_receive.merge! hdrh
-        else
-          @hdrh_receive = hdrh
-        end
-      end
-    end
-    
-    @message_length = @message_length.sum.to_f / @message_length.size
-    @runtime = @runtime.sum.to_f / @runtime.size
-    
-    fmt = <<-END.gsub(/^ {6}/, '')
-      Nchan servers:                 %d
-      runtime:                       %d
-      channels:                      %d
-      subscribers:                   %d
-      subscribers per channel:       %.1f
-      messages:
-        length:                      %d
-        sent:                        %d
-        send_confirmed:              %d
-        send_unconfirmed:            %d
-        send_failed:                 %d
-        received:                    %d
-        unreceived:                  %d
-        send rate:                   %.3f/sec
-        receive rate:                %.3f/sec
-        send rate per channel:       %.3f/min
-        receive rate per subscriber: %.3f/min
-    END
-    out = fmt % [
-      @n, @runtime, @channels, @subscribers, @subscribers.to_f/@channels,
-      @message_length, @messages_sent, @messages_send_confirmed, @messages_send_unconfirmed, @messages_send_failed, 
-      @messages_received, @messages_unreceived,
-      @messages_sent.to_f/@runtime,
-      @messages_received.to_f/@runtime,
-      (@messages_sent.to_f* 60)/(@runtime * @channels),
-      (@messages_received.to_f * 60)/(@runtime * @subscribers)
-    ]
-    
-    out << hdrhistogram_stats("message publishing latency", @hdrh_publish) if @hdrh_publish
-    out << hdrhistogram_stats("message delivery latency", @hdrh_receive) if @hdrh_receive
-    
-    puts out
-  end
-  
-  def append_csv_file(file)
-    require "csv"
-    write_headers = File.zero?(file)
-    headers = %i[servers runtime channels subscribers 
-      message_length messages_sent messages_send_confirmed messages_send_unconfirmed messages_send_failed
-      messages_send_received messages_send_unreceived 
-      messages_send_rate messages_receive_rate messages_send_rate_per_channel messages_receive_rate_per_subscriber
-      message_publishing_response_avg message_publishing_response_99percentile message_publishing_response_stddev message_publishing_response_count
-      message_delivery_avg message_delivery_99percentile message_delivery_stddev message_delivery_count]
-    csv = CSV.open(file, "a", {headers: headers, write_headers: write_headers})
-    csv << [@n, @runtime, @channels, @subscribers, 
-      @message_length, @messages_sent, @messages_send_confirmed, @messages_send_unconfirmed, @messages_send_failed, 
-      @messages_received, @messages_unreceived,
-      @messages_sent.to_f/@runtime, @messages_received.to_f/@runtime,
-      (@messages_sent.to_f* 60)/(@runtime * @channels), (@messages_received.to_f * 60)/(@runtime * @subscribers),
-      @hdrh_publish.mean, @hdrh_publish.percentile(99.0), @hdrh_publish.max, @hdrh_publish.stddev, @hdrh_publish.count,
-      @hdrh_receive.mean, @hdrh_receive.percentile(99.0), @hdrh_receive.max, @hdrh_receive.stddev, @hdrh_receive.count
-    ]
-    csv.flush
-    csv.close
-  end
-end
-
-benchan = Benchan.new urls, init_args
+benchan = NchanTools::Benchmark.new urls, init_args
 benchan.run
 benchan.results
 benchan.append_csv_file(save_csv) if save_csv

data/lib/nchan_tools/benchmark.rb

@@ -0,0 +1,214 @@
+require 'nchan_tools/pubsub'
+require 'securerandom'
+require 'timers'
+require 'json'
+
+module NchanTools
+class Benchmark
+  class BenchmarkError < StandardError
+  end
+  def initialize(urls, init_args=nil)
+    @urls = urls
+    @n = urls.count
+    @initializing = 0
+    @ready = 0
+    @running = 0
+    @finished = 0
+    @subs = []
+    @results = {}
+    @failed = {}
+    
+    @init_args = init_args
+    
+    @hdrh_publish = nil
+    @hdrh_receive = nil
+    
+    subs = []
+  end
+  
+  def run
+    puts "connecting to #{@n} Nchan server#{@n > 1 ? "s" : ""}..."
+    @urls.each do |url|
+      sub = NchanTools::Subscriber.new(url, 1, client: :websocket, timeout: 900000, extra_headers: {"Accept" => "text/x-json-hdrhistogram"})
+      sub.on_failure do |err|
+        unless @results[sub]
+          unless @results[sub.url]
+            @failed[sub] = true
+            abort err, sub
+          end
+        end
+        false
+      end
+      sub.on_message do |msg|
+        msg = msg.to_s
+        case msg
+        when /^READY/
+          puts   "  #{sub.url} ok"
+          @ready +=1
+          if @ready == @n
+            control :run
+            puts "start benchmark..."
+          end
+        when /^RUNNING/
+          puts   "  #{sub.url} running"
+        when /^RESULTS\n/
+          msg = msg[8..-1]
+          parsed = JSON.parse msg
+          @results[sub.url] = parsed
+          @results[sub.url]["raw"] = msg if @results[sub.url]
+          1+1
+        when /^INITIALIZING/
+          #do nothing
+        else
+          raise BenchmarkError, "unexpected server response: #{msg}"
+        end
+      end
+      @subs << sub
+      sub.run
+      sub.wait :ready, 1
+      if @failed[sub]
+        puts "  #{sub.url} failed"
+      else
+        puts "  #{sub.url} ok"
+      end
+    end
+    return if @failed.count > 0
+    puts "initializing benchmark..."
+    control :init
+    self.wait
+    puts "finished."
+    puts ""
+  end
+  
+  def wait
+    @subs.each &:wait
+  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
+  
+  def abort(err, src_sub = nil)
+    puts "  #{err}"
+    @subs.each do |sub|
+      sub.terminate unless sub == src_sub
+    end
+  end
+  
+  def hdrhistogram_stats(name, histogram)
+    fmt = <<-END.gsub(/^ {6}/, '')
+      %s
+        min:                         %.3fms
+        avg:                         %.3fms
+        99%%ile:                      %.3fms
+        max:                         %.3fms
+        stddev:                      %.3fms
+        samples:                     %d
+    END
+    fmt % [ name,
+      histogram.min, histogram.mean, histogram.percentile(99.0), histogram.max, histogram.stddev, histogram.count
+    ]
+  end
+  
+  def results
+    @channels = 0
+    @runtime = []
+    @subscribers = 0
+    @message_length = []
+    @messages_sent = 0
+    @messages_send_confirmed = 0
+    @messages_send_unconfirmed = 0
+    @messages_send_failed = 0
+    @messages_received = 0
+    @messages_unreceived = 0
+    @hdrh_publish = nil
+    @hdrh_receive = nil
+    @results.each do |url, data|
+      @channels += data["channels"]
+      @runtime << data["run_time_sec"]
+      @subscribers += data["subscribers"]
+      @message_length << data["message_length"]
+      @messages_sent += data["messages"]["sent"]
+      @messages_send_confirmed += data["messages"]["send_confirmed"]
+      @messages_send_unconfirmed += data["messages"]["send_unconfirmed"]
+      @messages_send_failed += data["messages"]["send_failed"]
+      @messages_received += data["messages"]["received"]
+      @messages_unreceived += data["messages"]["unreceived"]
+      
+      if data["message_publishing_histogram"]
+        hdrh = HDRHistogram.unserialize(data["message_publishing_histogram"], unit: :ms, multiplier: 0.001)
+        if @hdrh_publish
+          @hdrh_publish.merge! hdrh
+        else
+          @hdrh_publish = hdrh
+        end
+      end
+      if data["message_delivery_histogram"]
+        hdrh = HDRHistogram.unserialize(data["message_delivery_histogram"], unit: :ms, multiplier: 0.001)
+        if @hdrh_receive
+          @hdrh_receive.merge! hdrh
+        else
+          @hdrh_receive = hdrh
+        end
+      end
+    end
+    
+    @message_length = @message_length.sum.to_f / @message_length.size
+    @runtime = @runtime.sum.to_f / @runtime.size
+    
+    fmt = <<-END.gsub(/^ {6}/, '')
+      Nchan servers:                 %d
+      runtime:                       %d
+      channels:                      %d
+      subscribers:                   %d
+      subscribers per channel:       %.1f
+      messages:
+        length:                      %d
+        sent:                        %d
+        send_confirmed:              %d
+        send_unconfirmed:            %d
+        send_failed:                 %d
+        received:                    %d
+        unreceived:                  %d
+        send rate:                   %.3f/sec
+        receive rate:                %.3f/sec
+        send rate per channel:       %.3f/min
+        receive rate per subscriber: %.3f/min
+    END
+    out = fmt % [
+      @n, @runtime, @channels, @subscribers, @subscribers.to_f/@channels,
+      @message_length, @messages_sent, @messages_send_confirmed, @messages_send_unconfirmed, @messages_send_failed, 
+      @messages_received, @messages_unreceived,
+      @messages_sent.to_f/@runtime,
+      @messages_received.to_f/@runtime,
+      (@messages_sent.to_f* 60)/(@runtime * @channels),
+      (@messages_received.to_f * 60)/(@runtime * @subscribers)
+    ]
+    
+    out << hdrhistogram_stats("message publishing latency", @hdrh_publish) if @hdrh_publish
+    out << hdrhistogram_stats("message delivery latency", @hdrh_receive) if @hdrh_receive
+    
+    puts out
+  end
+  
+  def append_csv_file(file)
+    require "csv"
+    write_headers = File.zero?(file)
+    headers = %i[servers runtime channels subscribers message_length messages_sent messages_send_confirmed messages_send_unconfirmed messages_send_failed messages_send_received messages_send_unreceived messages_send_rate messages_receive_rate messages_send_rate_per_channel messages_receive_rate_per_subscriber message_publishing_response_avg message_publishing_response_99percentile message_publishing_response_max message_publishing_response_stddev message_publishing_response_count message_delivery_avg message_delivery_99percentile message_delivery_max message_delivery_stddev message_delivery_count]
+    csv = CSV.open(file, "a", {headers: headers, write_headers: write_headers})
+    csv << [@n, @runtime, @channels, @subscribers, 
+      @message_length, @messages_sent, @messages_send_confirmed, @messages_send_unconfirmed, @messages_send_failed, 
+      @messages_received, @messages_unreceived,
+      @messages_sent.to_f/@runtime, @messages_received.to_f/@runtime,
+      (@messages_sent.to_f* 60)/(@runtime * @channels), (@messages_received.to_f * 60)/(@runtime * @subscribers),
+      @hdrh_publish.mean, @hdrh_publish.percentile(99.0), @hdrh_publish.max, @hdrh_publish.stddev, @hdrh_publish.count,
+      @hdrh_receive.mean, @hdrh_receive.percentile(99.0), @hdrh_receive.max, @hdrh_receive.stddev, @hdrh_receive.count
+    ]
+    csv.flush
+    csv.close
+  end
+end
+end

data/lib/nchan_tools/pubsub.rb

@@ -3,7 +3,7 @@ require 'typhoeus'
 require 'json'
 require 'oga'
 require 'yaml'
-require 'pry'
+
 require 'celluloid/current'
 require 'date'
 Typhoeus::Config.memoize = false
@@ -46,15 +46,12 @@ module URI
     u
   end
 end
-
-$seq = 0
+module NchanTools
 class Message
   attr_accessor :content_type, :message, :times_seen, :etag, :last_modified, :eventsource_event
   def initialize(msg, last_modified=nil, etag=nil)
     @times_seen=1
     @message, @last_modified, @etag = msg, last_modified, etag
-    $seq+=1
-    @seq = $seq
     @idhist = []
   end
   def serverside_id
@@ -703,7 +700,7 @@ class Subscriber
       end
       @connected -= 1
       if @connected <= 0
-        binding.pry unless @ws.count == 0
+        sleep 0.1 until @ws.count == 0
         @cooked.signal true
       end
     end
@@ -1895,3 +1892,4 @@ class Publisher
 
   
 end
+end

data/lib/nchan_tools/version.rb

@@ -1,3 +1,3 @@
 module NchanTools
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nchan_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Leo Ponomarev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-06 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -228,6 +228,7 @@ files:
 - exe/nchan-pub
 - exe/nchan-sub
 - lib/nchan_tools.rb
+- lib/nchan_tools/benchmark.rb
 - lib/nchan_tools/pubsub.rb
 - lib/nchan_tools/version.rb
 - nchan_tools.gemspec