plr-speedtest 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 917e92197eb60a1304f9caf430bb6c29c71d02d79a2b2c5b3cec0b59d98d53fe
-  data.tar.gz: 64494899740408ee2d7fc2d8809cdacbdc845567f0e60a5d0534996e673cfd59
+  metadata.gz: 73d4d621364f2ead38d1d11300cbe8e31f99eb61e99cb2b240eb3dd5a9e1f805
+  data.tar.gz: 373baa9881da4b0169caa9877f4ad438ec0bebb2a0570a890c9d579d9e4e65ba
 SHA512:
-  metadata.gz: b320f647b1facbdaccf131c42b1f5e6afaa9fe8dd9aa3edd543a171a1fa94771d7bf3f273fd733305026c27e538f86ce75ce579255b46492be1278c6998423f5
-  data.tar.gz: 3e340043d664bace37a2f415b0248bdd1aa31a345dcf1ccf290276b96e1c058f11fd9cb7c1158d41783ccf4c2a9fd663030e1bc6b32eea2b1ae1080260ec9830
+  metadata.gz: 46fb6d63bf16d3e98b836446dae58306c652bc9abeba0f91090abec890f6d7e0de6c3e2cca7ef6977c59e8a3a8a1fee13ca4a4f76a3a999c371e1537b4cb3b43
+  data.tar.gz: 18f813f4b4333bf9da00f37add3f270c297b3a6a16ab7d980bfd1345c75a9069b44a69686c9ff849850f5cc92a8035585d8044ef2893a51e114cc34f137d7323

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
   - 2.3.0
+  - 2.4.2
+  - 2.5.1
 before_install: gem install bundler -v 1.11.2

data/lib/speedtest/download_worker.rb

@@ -0,0 +1,26 @@
+require 'celluloid/current'
+
+module Speedtest
+
+  class DownloadWorker
+    include Celluloid
+
+    def initialize(url, logger)
+      @logger = logger
+      @url = url
+    end
+
+    def download
+      @logger.debug "  downloading: #{@url}"
+      status = ThreadStatus.new(false, 0)
+
+      page = HTTParty.get(@url, timeout: 10)
+      unless page.code / 100 == 2
+        error "GET #{url} failed with code #{page.code}"
+        status.error = true
+      end
+      status.size = page.body.length
+      status
+    end
+  end
+end

data/lib/speedtest/ring.rb

@@ -0,0 +1,55 @@
+module Speedtest
+  class FullRing < StandardError; end
+
+  class Ring
+    def initialize(size)
+      raise ArgumentError, 'size cannot be 0' if size == 0
+
+      @size = size
+      @arr = Array.new(size)
+      @num_free = @size
+
+      @append_pos = 0
+      @pop_pos = 0
+    end
+
+    def append(elt)
+      raise FullRing unless num_free > 0
+
+      @arr[append_pos] = elt
+
+      @num_free -= 1
+      @append_pos += 1
+    end
+
+    def pop
+      return nil unless num_busy > 0
+
+      value = @arr[pop_pos]
+      @arr[pop_pos] = nil
+
+      @num_free += 1
+      @pop_pos += 1
+
+      return value
+    end
+
+    private
+
+    def append_pos
+      @append_pos % @size
+    end
+
+    def pop_pos
+      @pop_pos % @size
+    end
+
+    def num_free
+      @num_free
+    end
+
+    def num_busy
+      @size - @num_free
+    end
+  end
+end

data/lib/speedtest/upload_worker.rb

@@ -0,0 +1,25 @@
+require 'celluloid/current'
+
+module Speedtest
+  class UploadWorker
+    include Celluloid
+
+    def initialize(url, logger)
+      @url = url
+      @logger = logger
+    end
+
+    def upload(content)
+      status = ThreadStatus.new(false, 0)
+
+      page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
+      @logger.debug "upload response body = [#{page.body}]"
+      unless page.code / 100 == 2
+        error "GET #{url} failed with code #{page.code}"
+        status.error = true
+      end
+      status.size = page.body.split('=')[1].to_i
+      status
+    end
+  end
+end

data/lib/speedtest/version.rb

@@ -1,3 +1,3 @@
 module Speedtest
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/speedtest.rb

@@ -2,19 +2,32 @@ require 'httparty'
 
 require_relative 'speedtest/result'
 require_relative 'speedtest/geo_point'
+require_relative 'speedtest/download_worker'
+require_relative 'speedtest/upload_worker'
+require_relative 'speedtest/ring'
 
 module Speedtest
+  ThreadStatus = Struct.new(:error, :size)
+
   class Test
 
     class FailedTransfer < StandardError; end
 
+    HTTP_PING_TIMEOUT = 5
+
     def initialize(options = {})
-      @download_runs = options[:download_runs]     || 4
-      @upload_runs = options[:upload_runs]         || 4
-      @ping_runs = options[:ping_runs]             || 4
-      @download_sizes = options[:download_sizes]   || [750, 1500]
-      @upload_sizes = options[:upload_sizes]       || [197190, 483960]
+      @min_transfer_secs = options[:min_transfer_secs] || 10
+      @num_threads   = options[:num_threads]           || 4
+      @ping_runs = options[:ping_runs]                 || 4
+      @download_size = options[:download_size]         || 4000
+      @upload_size = options[:upload_size]             || 1_000_000
       @logger = options[:logger]
+      @num_transfers_padding = options[:num_transfers_padding] || 5
+
+      if @num_transfers_padding > @num_threads
+        @num_transfers_padding = @num_threads
+      end
+      @ping_runs = 2 if @ping_runs < 2
     end
 
     def run()
@@ -55,51 +68,34 @@ module Speedtest
       @logger.error msg if @logger
     end
 
-    def downloadthread(url)
-      log "  downloading: #{url}"
-      page = HTTParty.get(url)
-      unless page.code / 100 == 2
-        error "GET #{url} failed with code #{page.code}"
-        Thread.current["error"] = true
-      end
-      Thread.current["downloaded"] = page.body.length
-    end
-
     def download
       log "\nstarting download tests:"
-      threads = []
-
-      start_time = Time.new
-      @download_sizes.each { |size|
-        1.upto(@download_runs) { |i|
-          threads << Thread.new { |thread|
-            downloadthread("#{@server_root}/speedtest/random#{size}x#{size}.jpg")
-          }
-        }
-      }
+
+      start_time = Time.now
+      futures_ring = Ring.new(@num_threads + @num_transfers_padding)
+      download_url = "#{@server_root}/speedtest/random#{@download_size}x#{@download_size}.jpg"
+      pool = DownloadWorker.pool(size: @num_threads, args: [download_url, @logger])
+      1.upto(@num_threads + @num_transfers_padding).each do |i|
+        futures_ring.append(pool.future.download)
+      end
 
       total_downloaded = 0
-      threads.each { |t|
-        t.join
-        total_downloaded += t["downloaded"]
-        raise FailedTransfer.new("Download failed.") if t["error"] == true
-      }
+      while (future = futures_ring.pop) do
+        status = future.value
+        raise FailedTransfer.new("Download failed.") if status.error == true
+        total_downloaded += status.size
+
+        if Time.now - start_time < @min_transfer_secs
+          futures_ring.append(pool.future.download)
+        end
+      end
 
       total_time = Time.new - start_time
-      log "Took #{total_time} seconds to download #{total_downloaded} bytes in #{threads.length} threads\n"
+      log "Took #{total_time} seconds to download #{total_downloaded} bytes in #{@num_threads} threads\n"
 
       [ total_downloaded * 8, total_time ]
     end
 
-    def uploadthread(url, content)
-      page = HTTParty.post(url, :body => { "content" => content })
-      unless page.code / 100 == 2
-        error "GET #{url} failed with code #{page.code}"
-        Thread.current["error"] = true
-      end
-      Thread.current["uploaded"] = page.body.split('=')[1].to_i
-    end
-
     def randomString(alphabet, size)
       (1.upto(size)).map { alphabet[rand(alphabet.length)] }.join
     end
@@ -107,30 +103,30 @@ module Speedtest
     def upload
       log "\nstarting upload tests:"
 
-      data = []
-      @upload_sizes.each { |size|
-        1.upto(@upload_runs) {
-          data << randomString(('A'..'Z').to_a, size)
-        }
-      }
+      data = randomString(('A'..'Z').to_a, @upload_size)
 
-      threads = []
-      start_time = Time.new
-      threads = data.map { |data|
-        Thread.new(data) { |content|
-          log "  uploading size #{content.size}: #{@server_root}/speedtest/upload.php"
-          uploadthread("#{@server_root}/speedtest/upload.php", content)
-        }
-      }
+      start_time = Time.now
+
+      futures_ring = Ring.new(@num_threads + @num_transfers_padding)
+      upload_url = "#{@server_root}/speedtest/upload.php"
+      pool = UploadWorker.pool(size: @num_threads, args: [upload_url, @logger])
+      1.upto(@num_threads + @num_transfers_padding).each do |i|
+        futures_ring.append(pool.future.upload(data))
+      end
 
       total_uploaded = 0
-      threads.each { |t|
-        t.join
-        total_uploaded += t["uploaded"]
-        raise FailedTransfer.new("Upload failed.") if t["error"] == true
-      }
+      while (future = futures_ring.pop) do
+        status = future.value
+        raise FailedTransfer.new("Upload failed.") if status.error == true
+        total_uploaded += status.size
+
+        if Time.now - start_time < @min_transfer_secs
+          futures_ring.append(pool.future.upload(data))
+        end
+      end
+
       total_time = Time.new - start_time
-      log "Took #{total_time} seconds to upload #{total_uploaded} bytes in #{threads.length} threads\n"
+      log "Took #{total_time} seconds to upload #{total_uploaded} bytes in #{@num_threads} threads\n"
 
       # bytes to bits / time = bps
       [ total_uploaded * 8, total_time ]
@@ -167,10 +163,10 @@ module Speedtest
       1.upto(@ping_runs) {
         start = Time.new
         begin
-          page = HTTParty.get("#{server}/speedtest/latency.txt")
+          page = HTTParty.get("#{server}/speedtest/latency.txt", timeout: HTTP_PING_TIMEOUT)
           times << Time.new - start
         rescue Timeout::Error, Net::HTTPNotFound, Errno::ENETUNREACH => e
-          log "#{e.class} #{e}"
+          log "ping error: #{e.class} [#{e}] for #{server}"
           times << 999999
         end
       }

data/speedtest.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "httparty", "~> 0.13"
+  spec.add_runtime_dependency "celluloid", "~> 0.17.3"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plr-speedtest
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Pete Myron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gemmed version of lacostej's speedtest.rb script @ https://github.com/lacostej/speedtest.rb
   - Test your speed with speedtest.net!
 email:
@@ -84,8 +112,11 @@ files:
 - README.md
 - Rakefile
 - lib/speedtest.rb
+- lib/speedtest/download_worker.rb
 - lib/speedtest/geo_point.rb
 - lib/speedtest/result.rb
+- lib/speedtest/ring.rb
+- lib/speedtest/upload_worker.rb
 - lib/speedtest/version.rb
 - speedtest.gemspec
 homepage: https://github.com/petemyron/speedtest