zold 0.14.25 → 0.14.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b9ff618493d8f11a6c1afde18902fd7a314646f
-  data.tar.gz: f71b0e5dfc59c87984577c4b89177b67553d67ac
+  metadata.gz: f4395e269936df99f2f80289e47287be347e2f3a
+  data.tar.gz: 5719f9f81b7c4c70860c67a1903cfc01b5dbe95c
 SHA512:
-  metadata.gz: '038d20d582f5367e772aa240812a5bf4367417bf350417bec4d2cc206005ff128f77acb64aa1a2fe43c31ce9621b4639be0cbb43eedb2977ff0140628893eea8'
-  data.tar.gz: c868c40269b7cb3504acb629ef40f7b24c3cd17ca9e2341ecaa0d1b2d61ce52fc031ddbac868b86c2abfae4dba03756d73141bbf411fa1bde044bb1cc6d4adcc
+  metadata.gz: b8849738bb1417903741cb729467ae2f96e1a244578a8702a0e4b0d69f674ba710587c17bed2ff023b639aed6d0825748f4e970f371dd7360a3d3692ab6a9898
+  data.tar.gz: 4d84feac840f4e4992025e8938ce24a62ec3d56d14b5393460984e8d8de907d8295f1b07b6f485b19f2e03342ff113d9dbeb4ceed5c0159229a4c0357dfe5f42

data/lib/zold/node/farm.rb

@@ -147,8 +147,8 @@ module Zold
       return unless s.port == port
       return unless s.strength >= strength
       Thread.current.name = s.to_mnemo
-      cmd = "ruby #{File.join(File.dirname(__FILE__), '../../../bin/zold')} next \"#{s}\""
-      Open3.popen2e(cmd) do |stdin, stdout, thr|
+      bin = File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/zold'))
+      Open3.popen2e("ruby #{bin} next \"#{s}\"") do |stdin, stdout, thr|
         @log.debug("Score counting started in process ##{thr.pid}")
         begin
           stdin.close

data/lib/zold/remotes.rb

@@ -168,13 +168,14 @@ module Zold
     def iterate(log, farm: Farm::Empty.new)
       raise 'Log can\'t be nil' if log.nil?
       raise 'Farm can\'t be nil' if farm.nil?
-      return if all.empty?
+      list = all
+      return if list.empty?
       best = farm.best[0]
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
       idx = 0
-      pool = Concurrent::FixedThreadPool.new([all.count, Concurrent.processor_count * 4].min, max_queue: 0)
-      all.each do |r|
+      pool = Concurrent::FixedThreadPool.new([list.count, Concurrent.processor_count * 4].min, max_queue: 0)
+      list.each do |r|
         pool.post do
           Thread.current.abort_on_exception = true
           Thread.current.name = 'remotes'
@@ -192,9 +193,8 @@ module Zold
             raise 'Took too long to execute' if (Time.now - start).round > @timeout
           rescue StandardError => e
             error(r[:host], r[:port])
-            errors = errors(r[:host], r[:port])
             log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} \
-in #{(Time.now - start).round}s; errors=#{errors}")
+in #{(Time.now - start).round}s")
             log.debug(Backtrace.new(e).to_s)
             remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
           end
@@ -204,17 +204,6 @@ in #{(Time.now - start).round}s; errors=#{errors}")
       pool.kill unless pool.wait_for_termination(5 * 60)
     end
 
-    def errors(host, port = Remotes::PORT)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Port can\'t be nil' if port.nil?
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      @mutex.synchronize do
-        list = load
-        raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
-        list.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors]
-      end
-    end
-
     def error(host, port = Remotes::PORT)
       raise 'Host can\'t be nil' if host.nil?
       raise 'Port can\'t be nil' if port.nil?

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.25'
+  VERSION = '0.14.26'
   PROTOCOL = 2
 end

data/test/test_remotes.rb

@@ -215,6 +215,38 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_quickly_ads_and_reads
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'uu-90.csv'))
+      remotes.clean
+      threads = 20
+      pool = Concurrent::FixedThreadPool.new(threads)
+      done = Concurrent::AtomicFixnum.new
+      start = Time.now
+      alive = true
+      100.times { |i| remotes.add('192.168.0.1', 8080 + i) }
+      threads.times do |i|
+        pool.post do
+          loop do
+            break unless alive
+            Zold::VerboseThread.new(test_log).run(true) do
+              remotes.add('127.0.0.1', 8080 + i)
+              remotes.error('127.0.0.1', 8080 + i)
+              remotes.all
+              remotes.iterate(test_log) { done.increment }
+              remotes.remove('127.0.0.1', 8080 + i)
+            end
+          end
+        end
+      end
+      sleep 0.1 while done.value < 1000
+      alive = false
+      pool.shutdown
+      pool.wait_for_termination(10)
+      test_log.info("Total time: #{Time.now - start}")
+    end
+  end
+
   def test_empty_remotes
     remotes = Zold::Remotes::Empty.new(file: '/tmp/empty')
     assert(remotes.is_a?(Zold::Remotes))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.25
+  version: 0.14.26
 platform: ruby
 authors:
 - Yegor Bugayenko