zold 0.13.22 → 0.13.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e4d4e5e627137b421211b093b25dd2930423d7
-  data.tar.gz: e78835ebe8c5ead373287def6500d3d17a9ab648
+  metadata.gz: b063b1f42e4e318877c41c1281df5ece0c0a61c4
+  data.tar.gz: 8b42936d634c08e26c3b3381c296a9de9cd28ec3
 SHA512:
-  metadata.gz: e0d902fe84aa485c17b9785d83a832ca212c001db35bedd520026d1f4bc41e162006b3aecc3459192a9d5d24e6bfdbcd7a157edb871695b34fe663c816f35f6c
-  data.tar.gz: 176e92ee884fb86e0ef764bf05478cebb940183b07082f6f8ade8cec1162648cdcc319ace98fdd6776e9f2506afa9f2794163e483a0493445a252f97d9b619e2
+  metadata.gz: c4abf169be0eff5474adfa835e34d4035d2278b38ae8f56211b47a611d352f52048df27d75b557b1f4ac61d96ec44b2240eb3e0e4365b4bb32fffc9f577db35d
+  data.tar.gz: aabaf695df10333689e85d8499a8ba0066af11c08b40f62a330123db012b03e81de35f7b03f685ba989be8ec0099852dd9dd5a23a57a997e3e1b9263d61f266e

data/README.md

@@ -197,13 +197,9 @@ network. You can see the full list of nodes at `/remotes` URL of your node.
     your CPUs. It is recommended to make this number equal to the
     number of CPUs available.
 
-  * `scores` is ... something not important to you.
+  * `pipeline` is ... something not important to you.
 
-  * `best` is ... something not important to you.
-
-  * `history` is the amount of scores currently saved on the disc. The
-    farm keeps them there in case the node gets restarted. It will load
-    them back and reuse.
+  * `best` is the list of scores known to the farm at the moment (with their ages in minutes).
 
 `entrance` is the place where all new wallets arive and get merged and pushed
 further. The health of this point is critical to the entire node. Some

data/lib/zold/node/farm.rb

@@ -42,21 +42,18 @@ module Zold
       @log = log
       @cache = cache
       @invoice = invoice
-      @scores = []
+      @pipeline = Queue.new
       @threads = []
-      @best = []
       @mutex = Mutex.new
     end
 
     def best
-      @mutex.synchronize do
-        @best.to_a
-      end
+      load
     end
 
     def to_text
       @threads.map do |t|
-        "#{t.name}: status=#{t.status}; alive=#{t.alive};\n  #{t.backtrace.join("\n  ")}"
+        "#{t.name}: status=#{t.status}; alive=#{t.alive?};\n  #{t.backtrace.join("\n  ")}"
       end.join("\n")
     end
 
@@ -65,18 +62,15 @@ module Zold
         threads: @threads.map do |t|
           "#{t.name}/#{t.status}/#{t.alive? ? 'A' : 'D'}"
         end.join(', '),
-        scores: @scores.size,
-        best: @best.map(&:value).join(', '),
-        history: history.count
+        pipeline: @pipeline.size,
+        best: best.map { |s| "#{s.value}/#{(s.age / 60).round}m" }.join(', ')
       }
     end
 
     def start(host, port, strength: 8, threads: 8)
-      @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
-      @scores = Queue.new
-      @best = history
-      clean(host, port, strength, threads)
-      @log.info("#{@scores.size} scores pre-loaded, the best is: #{@best[0]}")
+      @log.info('Zero-threads farm won\'t score anything!') if threads.zero?
+      cleanup(host, port, strength, threads)
+      @log.info("#{@pipeline.size} scores pre-loaded, the best is: #{best[0]}")
       @threads = (1..threads).map do |t|
         Thread.new do
           Thread.current.name = "f#{t}"
@@ -88,11 +82,11 @@ module Zold
         end
       end
       @threads << Thread.new do
-        Thread.current.name = 'cleaner'
+        Thread.current.name = 'cleanup'
         loop do
           sleep(60) unless strength == 1 # which will only happen in tests
           VerboseThread.new(@log).run do
-            clean(host, port, strength, threads)
+            cleanup(host, port, strength, threads)
           end
         end
       end
@@ -118,49 +112,56 @@ module Zold
 
     private
 
-    def clean(host, port, strength, threads)
-      @mutex.synchronize do
-        before = @best.map(&:value).max.to_i
-        @best = @best.select(&:valid?).reject(&:expired?).sort_by(&:value).reverse
-        @best = @best.take(threads) unless threads.zero?
-        if @best.empty? || !threads.zero? && @best.map(&:age_hours).min > 24 / threads
-          @best << Score.new(Time.now, host, port, @invoice, strength: strength)
-        end
-        @best.sort_by(&:age_hours).each { |b| @scores << b }
-        after = @best.map(&:value).max
-        @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
+    def cleanup(host, port, strength, threads)
+      scores = load
+      before = scores.map(&:value).max.to_i
+      if scores.empty? || !threads.zero? && scores.map(&:age).min > 24 * 60 * 60 / threads
+        save([Score.new(Time.now, host, port, @invoice, strength: strength)])
+      else
+        save
       end
+      scores = load
+      @pipeline << scores.min_by(&:age) if @pipeline.size < threads
+      after = scores.map(&:value).max.to_i
+      @log.debug("#{Thread.current.name}: best score is #{scores[0]}") if before != after && !after.zero?
     end
 
     def cycle(host, port, strength, threads)
-      s = @scores.pop
+      s = @pipeline.pop
       return unless s.valid?
       return unless s.host == host
       return unless s.port == port
       return unless s.strength >= strength
-      n = s.next
-      @mutex.synchronize do
-        save(n)
-        @best << n
-      end
-      clean(host, port, strength, threads)
-      @scores << n
+      save([s.next])
+      cleanup(host, port, strength, threads)
     end
 
-    def save(score)
-      AtomicFile.new(@cache).write((history + [score]).map(&:to_s).uniq.join("\n"))
+    def save(list = [])
+      scores = load + list
+      @mutex.synchronize do
+        AtomicFile.new(@cache).write(
+          scores.select(&:valid?)
+            .reject(&:expired?)
+            .map(&:to_s)
+            .uniq
+            .join("\n")
+        )
+      end
     end
 
-    def history
-      if File.exist?(@cache)
-        AtomicFile.new(@cache).read
-          .split(/\n/)
-          .map { |t| Score.parse(t) }
-          .select(&:valid?)
-          .sort_by(&:value)
-          .reverse
-      else
-        []
+    def load
+      @mutex.synchronize do
+        if File.exist?(@cache)
+          AtomicFile.new(@cache).read
+            .split(/\n/)
+            .map { |t| Score.parse(t) }
+            .select(&:valid?)
+            .reject(&:expired?)
+            .sort_by(&:value)
+            .reverse
+        else
+          []
+        end
       end
     end
   end

data/lib/zold/score.rb

@@ -141,7 +141,7 @@ module Zold
         hash: value.zero? ? nil : hash,
         expired: expired?,
         valid: valid?,
-        minutes: ((Time.now - @time) / 60).to_i,
+        age: (age / 60).round,
         created: @created.utc.iso8601
       }
     end
@@ -168,12 +168,12 @@ module Zold
       end
     end
 
-    def age_hours
-      (Time.now - @time) / (60 * 60)
+    def age
+      Time.now - @time
     end
 
     def expired?(hours = 24)
-      age_hours > hours
+      age > hours * 60 * 60
     end
 
     def prefix

data/lib/zold/version.rb

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

data/test/node/test_farm.rb

@@ -32,12 +32,21 @@ class FarmTest < Minitest::Test
       farm.start('localhost', 80, threads: 4, strength: 2) do
         sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
         count = 0
-        100.times { count += farm.to_json[:history] }
+        100.times { count += farm.to_json[:best].length }
         assert(count > 0)
       end
     end
   end
 
+  def test_renders_in_text
+    Dir.mktmpdir 'test' do |dir|
+      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
+      farm.start('localhost', 80, threads: 2, strength: 1) do
+        assert(!farm.to_text.nil?)
+      end
+    end
+  end
+
   def test_makes_best_score_in_background
     Dir.mktmpdir 'test' do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.22
+  version: 0.13.23
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby