zold 0.13.20 → 0.13.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7624ccdaec6f4098e5e024189d4345e8805d7095
-  data.tar.gz: 585ad1cbafa0e8424d1017b3983156c94af543f5
+  metadata.gz: 9b54e147de6f13a87996515785862a09da82b1a5
+  data.tar.gz: 332d33f707a6ad855001b9d77738d2f497622ef7
 SHA512:
-  metadata.gz: f0212c757e122fd6c2429959a42e73c4972022c2471f7e24e248d5f69c6e20cfb3d004813c36f64221a9f16b6e5d5de9d3e2a87a7a90fc99c085b02a648b27d2
-  data.tar.gz: 320d3092ef14317b3566d92b98aa238bd56a82714e3fb54b850100bec75650259c266fac08c16f0fef8236bb378f0fd5f41a90dde0a3002ee3ab78a8c82675c2
+  metadata.gz: 6696d078025e97891007c9295fd2210de314c4dbbcef5e968fc4d7a9dd5b614c81903a4066ee4016074c7974321c1e3d656825f01d934ae0dcc55869aa693041
+  data.tar.gz: 4463d7a107bbb6acb7a89931ae745dcc05598005cccaca4caf56c2484b5376f3ee07b595fca407376432bf4fcf7461408ff6f88aae52718165e784bf24faaff0

data/lib/zold/node/farm.rb

@@ -38,7 +38,6 @@ module Zold
       end
     end
 
-    attr_reader :best
     def initialize(invoice, cache, log: Log::Quiet.new)
       @log = log
       @cache = cache
@@ -46,14 +45,28 @@ module Zold
       @scores = []
       @threads = []
       @best = []
-      @semaphore = Mutex.new
+      @mutex = Mutex.new
+    end
+
+    def best
+      @mutex.synchronize do
+        @best.to_a
+      end
+    end
+
+    def to_text
+      @threads.map do |t|
+        "#{t.name}: status=#{t.status}; alive=#{t.alive};\n  #{t.backtrace.join("\n  ")}"
+      end.join("\n")
     end
 
     def to_json
       {
-        threads: @threads.map { |t| "#{t.name}/#{t.status}" }.join(', '),
+        threads: @threads.map do |t|
+          "#{t.name}/#{t.status}/{t.alive? ? 'A' : 'D'}"
+        end.join(', '),
         scores: @scores.size,
-        best: @best.count,
+        best: @best.map(&:value).join(', '),
         history: history.count
       }
     end
@@ -67,17 +80,19 @@ module Zold
       @log.info("#{@scores.size} scores pre-loaded, the best is: #{@best[0]}")
       @threads = (1..threads).map do |t|
         Thread.new do
-          VerboseThread.new(@log).run do
-            Thread.current.name = "farm-#{t}"
-            loop { cycle(host, port, strength, threads) }
+          Thread.current.name = "f#{t}"
+          loop do
+            VerboseThread.new(@log).run do
+              cycle(host, port, strength, threads)
+            end
           end
         end
       end
       @threads << Thread.new do
-        VerboseThread.new(@log).run do
-          Thread.current.name = 'farm-cleaner'
-          loop do
-            sleep(60) unless strength == 1 # which will only happen in tests
+        Thread.current.name = 'cleaner'
+        loop do
+          sleep(60) unless strength == 1 # which will only happen in tests
+          VerboseThread.new(@log).run do
             clean(host, port, strength, threads)
           end
         end
@@ -105,13 +120,18 @@ module Zold
     private
 
     def clean(host, port, strength, threads)
-      if @scores.length < threads || @best.count < threads
-        zero = Score.new(Time.now, host, port, @invoice, strength: strength)
-        @scores << zero
-        @best << zero
+      @mutex.synchronize do
+        before = @best.map(&:value).max
+        @best = @best.reject(&:expired?).sort_by(&:value).reverse
+        @best = @best.take(threads) unless threads.zero?
+        if @scores.length < threads || @best.count < threads
+          zero = Score.new(Time.now, host, port, @invoice, strength: strength)
+          @scores << zero
+          @best << zero
+        end
+        after = @best.map(&:value).max
+        @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
       end
-      @best = @best.reject(&:expired?).sort_by(&:value).reverse
-      @best = @best.take(threads) unless threads.zero?
     end
 
     def cycle(host, port, strength, threads)
@@ -122,14 +142,11 @@ module Zold
       return unless s.port == port
       return unless s.strength >= strength
       n = s.next
-      @semaphore.synchronize do
-        before = @best.map(&:value).max
+      @mutex.synchronize do
         save(n)
         @best << n
-        clean(host, port, strength, threads)
-        after = @best.map(&:value).max
-        @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
       end
+      clean(host, port, strength, threads)
       @scores << n
     end
 

data/lib/zold/node/front.rb

@@ -196,6 +196,11 @@ module Zold
       )
     end
 
+    get '/farm' do
+      content_type 'text/plain'
+      settings.farm.to_text
+    end
+
     not_found do
       status 404
       content_type 'text/plain'

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.13.20'.freeze
+  VERSION = '0.13.21'.freeze
 end

data/test/node/test_farm.rb

@@ -90,7 +90,9 @@ class FarmTest < Minitest::Test
       farm.start(score.host, score.port, threads: 1, strength: score.strength) do
         100.times do
           sleep(0.1)
-          break if farm.best[0].value.zero?
+          b = farm.best[0]
+          assert(!b.nil?)
+          break if b.value.zero?
         end
         assert_equal(0, farm.best[0].value)
       end

data/test/node/test_front.rb

@@ -36,6 +36,7 @@ class FrontTest < Minitest::Test
           '/',
           '/remotes',
           '/version',
+          '/farm',
           '/score'
         ],
         '404' => [
@@ -146,8 +147,8 @@ class FrontTest < Minitest::Test
         "Expected HTTP 200 OK: Found #{response.code}"
       )
       assert_operator(
-        500, :>, response['content-length'].to_i,
-        'Expected the content to be smaller than 500bytes for gzip'
+        600, :>, response['content-length'].to_i,
+        'Expected the content to be smaller than 600 bytes for gzip'
       )
     end
   end

metadata

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