zold 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 396a65bbca7258f8feecc54b1474e49805316f4088bbc7a9a6f1e62ff5a33ac8
-  data.tar.gz: 5172b79f8b015f94ad90a4453e110778d7f21a75b2e6643a77e009ecb8244987
+  metadata.gz: d50cb5eed786603d787de81db031216d416178af36f172b539d75fcdb944546d
+  data.tar.gz: f7839b40f6749768636948106d61a10c0251156bcc24b7e5012d9f10964daac1
 SHA512:
-  metadata.gz: f2dfba67609c3021e6f7504a7fbd077d45388f4aad4e0aeca8475f624ee7fa37df8d262efad99250b304d6169ed735e8de739e766869d91fa601be080744db92
-  data.tar.gz: a27154e642518f971672bc210aeeb81c5291a307c9ecc04daf1a7e781637033fe25dd1f343994ca1a696bf2c0b43939e1210b1f4c3d6a11aee934c2b9efce2f4
+  metadata.gz: cb8a213e6d5f13fae1c35f051caf3a9c8ade80d6199352f9d640544802ab603a0ae6d39a3a190c548350a0078d98149e7bdc5a67c421fc7dd441b387852585bf
+  data.tar.gz: 274a6a6ae2f7265bc76e6480aa93e21d7631efe33c77bbacc2612d9b1b00b1fbd23ec6c429d66a68ac4faacb885387331e169a77143f364e45e47366bdcd7e3b

data/bin/zold

@@ -34,6 +34,7 @@ require_relative '../lib/zold'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/dir_items'
+require_relative '../lib/zold/hands'
 require_relative '../lib/zold/wallets'
 require_relative '../lib/zold/tree_wallets'
 require_relative '../lib/zold/sync_wallets'
@@ -195,6 +196,8 @@ copies = File.join(zdata, 'copies')
 log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAINET ? 'main' : 'test'} net)")
 log.debug("Memory footprint at start is #{Zold::Size.new(GetProcessMem.new.bytes.to_i)}")
 
+Zold::Hands.start
+
 cmd = lambda do
   begin
     case command
@@ -281,4 +284,6 @@ else
   log.debug("Successfully finished in #{Zold::Age.new(start)}")
 end
 
+Zold::Hands.stop
+
 abort # We need this in case some threads are still alive

data/lib/zold/commands/clean.rb

@@ -34,6 +34,7 @@ require_relative '../log'
 require_relative '../http'
 require_relative '../copies'
 require_relative '../thread_pool'
+require_relative '../hands'
 
 # CLEAN command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -53,13 +54,13 @@ module Zold
         o.banner = "Usage: zold clean [ID...] [options]
 Available options:"
         o.integer '--threads',
-          "How many threads to use for cleaning copies (default: #{[Concurrent.processor_count / 2, 2].max})",
-          default: [Concurrent.processor_count / 2, 2].max
+          'How many threads to use for cleaning copies (default: 1)',
+          default: 1
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
       list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
-      ThreadPool.new('clean', log: @log).run(opts['threads'], list.uniq) do |id|
+      Hands.exec(opts['threads'], list.uniq) do |id|
         clean(Copies.new(File.join(@copies, id), log: @log), opts)
       end
     end

data/lib/zold/commands/fetch.rb

@@ -33,6 +33,7 @@ require 'concurrent'
 require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../thread_pool'
+require_relative '../hands'
 require_relative '../log'
 require_relative '../age'
 require_relative '../http'
@@ -94,7 +95,7 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
-      ThreadPool.new('fetch', log: @log).run(opts['threads'], list.uniq) do |id|
+      Hands.exec(opts['threads'], list.uniq) do |id|
         fetch(id, Copies.new(File.join(@copies, id)), opts)
       end
     end

data/lib/zold/commands/push.rb

@@ -28,6 +28,7 @@ require 'concurrent'
 require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../thread_pool'
+require_relative '../hands'
 require_relative '../age'
 require_relative '../size'
 require_relative '../log'
@@ -85,7 +86,7 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
-      ThreadPool.new('push', log: @log).run(opts['threads'], list.uniq) do |id|
+      Hands.exec(opts['threads'], list.uniq) do |id|
         push(id, opts)
       end
     end

data/lib/zold/hands.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'concurrent'
+require_relative 'thread_pool'
+require_relative 'endless'
+
+# Multiple threads that can do something useful together.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Hands
+  class Hands
+    # Pool of threads
+    POOL = ThreadPool.new('default')
+    private_constant :POOL
+
+    # Queue of jobs
+    QUEUE = Queue.new
+    private_constant :QUEUE
+
+    # Start
+    def self.start(max = Concurrent.processor_count * 8)
+      while POOL.count < max
+        POOL.add do
+          Endless.new('hands').run do
+            QUEUE.pop.call
+          end
+        end
+      end
+    end
+
+    # Stop
+    def self.stop
+      POOL.kill
+    end
+
+    # Run this code in many threads
+    def self.exec(threads, set = (0..threads - 1).to_a)
+      raise 'The thread pool is empty' if POOL.empty?
+      raise "Number of threads #{threads} has to be positive" unless threads.positive?
+      list = set.dup
+      total = [threads, set.count].min
+      if total == 1
+        list.each_with_index { |r, i| yield(r, i) }
+      elsif total.positive?
+        idx = Concurrent::AtomicFixnum.new
+        mutex = Mutex.new
+        latch = Concurrent::CountDownLatch.new(total)
+        errors = Set.new
+        total.times do |i|
+          QUEUE.push(
+            lambda do
+              Thread.current.name = "#{@title}-#{i}"
+              loop do
+                r = mutex.synchronize { list.pop }
+                break if r.nil?
+                yield(r, idx.increment - 1)
+              end
+            rescue StandardError => e
+              errors << e
+              raise e
+            ensure
+              latch.count_down
+            end
+          )
+        end
+        latch.wait
+        raise errors.to_a[0] unless errors.empty?
+      end
+    end
+  end
+end

data/lib/zold/remotes.rb

@@ -31,6 +31,7 @@ require 'backtrace'
 require 'zold/score'
 require_relative 'age'
 require_relative 'http'
+require_relative 'hands'
 require_relative 'thread_pool'
 require_relative 'node/farm'
 
@@ -188,7 +189,7 @@ 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?
-      ThreadPool.new('remotes', log: log).run(Concurrent.processor_count * 4, all) do |r, idx|
+      Hands.exec(Concurrent.processor_count * 4, all) do |r, idx|
         Thread.current.name = "remotes-#{idx}@#{r[:host]}:#{r[:port]}"
         start = Time.now
         best = farm.best[0]

data/lib/zold/thread_pool.rb

@@ -38,34 +38,6 @@ module Zold
       @start = Time.now
     end
 
-    # Run this code in many threads
-    def run(threads, set = (0..threads - 1).to_a)
-      raise "Number of threads #{threads} has to be positive" unless threads.positive?
-      list = set.dup
-      total = [threads, set.count].min
-      if total == 1
-        list.each_with_index { |r, i| yield(r, i) }
-      elsif total.positive?
-        idx = Concurrent::AtomicFixnum.new
-        mutex = Mutex.new
-        latch = Concurrent::CountDownLatch.new(total)
-        total.times do |i|
-          add do
-            Thread.current.name = "#{@title}-#{i}"
-            loop do
-              r = mutex.synchronize { list.pop }
-              break if r.nil?
-              yield(r, idx.increment - 1)
-            end
-          ensure
-            latch.count_down
-          end
-        end
-        latch.wait
-        kill
-      end
-    end
-
     # Add a new thread
     def add
       raise 'Block must be given to start()' unless block_given?
@@ -99,9 +71,7 @@ module Zold
 #{@threads.map { |t| "#{t.name}/#{t.status}" }.join(', ')}...")
       start = Time.new
       begin
-        @threads.each do |t|
-          t.join(0.1)
-        end
+        join(0.1)
       ensure
         @threads.each do |t|
           (t.thread_variable_get(:kids) || []).each(&:kill)
@@ -118,6 +88,11 @@ it was alive for #{Age.new(@start)}: #{@threads.map { |t| "#{t.name}/#{t.status}
       end
     end
 
+    # Is it empty and has no threads?
+    def empty?
+      @threads.empty?
+    end
+
     # How many threads are in there
     def count
       @threads.count

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.22.0'
+  VERSION = '0.22.1'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/test__helper.rb

@@ -40,6 +40,9 @@ if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
+require_relative '../lib/zold/hands'
+Zold::Hands.start
+
 module Zold
   class Test < Minitest::Test
     include Minitest::Hooks

data/test/test_hands.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'concurrent'
+require_relative 'test__helper'
+require_relative '../lib/zold/hands'
+
+# Hands test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestHands < Zold::Test
+  def test_runs_in_many_threads
+    idx = Concurrent::AtomicFixnum.new
+    threads = 50
+    Zold::Hands.exec(threads) do
+      idx.increment
+    end
+    assert_equal(threads, idx.value)
+  end
+
+  def test_runs_with_empty_set
+    Zold::Hands.exec(5, []) do
+      # nothing
+    end
+  end
+
+  def test_runs_with_index
+    idx = Concurrent::AtomicFixnum.new
+    indexes = Set.new
+    Zold::Hands.exec(10, %w[a b c]) do |_, i|
+      idx.increment
+      indexes << i
+    end
+    assert_equal(3, idx.value)
+    assert_equal('0 1 2', indexes.to_a.sort.join(' '))
+  end
+
+  def test_runs_with_exceptions
+    assert_raises do
+      Zold::Hands.exec(5) do |i|
+        if i == 4
+          sleep 0.1
+          raise 'intended'
+        end
+      end
+    end
+  end
+end

data/test/test_thread_pool.rb

@@ -43,43 +43,6 @@ class TestThreadPool < Zold::Test
     assert_equal(threads, idx.value)
   end
 
-  def test_runs_in_many_threads
-    idx = Concurrent::AtomicFixnum.new
-    threads = 50
-    Zold::ThreadPool.new('test', log: test_log).run(threads) do
-      idx.increment
-    end
-    assert_equal(threads, idx.value)
-  end
-
-  def test_runs_with_empty_set
-    Zold::ThreadPool.new('test', log: test_log).run(5, []) do
-      # nothing
-    end
-  end
-
-  def test_runs_with_index
-    idx = Concurrent::AtomicFixnum.new
-    indexes = Set.new
-    Zold::ThreadPool.new('test', log: test_log).run(10, %w[a b c]) do |_, i|
-      idx.increment
-      indexes << i
-    end
-    assert_equal(3, idx.value)
-    assert_equal('0 1 2', indexes.to_a.sort.join(' '))
-  end
-
-  def test_runs_with_exceptions
-    assert_raises do
-      Zold::ThreadPool.new('test', log: test_log).run(5) do |i|
-        if i == 4
-          sleep 0.1
-          raise 'intended'
-        end
-      end
-    end
-  end
-
   def test_adds_and_stops
     pool = Zold::ThreadPool.new('test', log: test_log)
     pool.add do

data/test/test_wallet.rb

@@ -29,6 +29,7 @@ require_relative '../lib/zold/age'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/txn'
+require_relative '../lib/zold/thread_pool'
 require_relative '../lib/zold/amount'
 require_relative '../lib/zold/commands/pay'
 
@@ -296,16 +297,17 @@ class TestWallet < Zold::Test
   end
 
   def test_collects_memory_garbage
-    # skip
+    skip
     require 'get_process_mem'
     start = GetProcessMem.new.bytes.to_i
-
-    40.times do |i|
-      wallet = Zold::Wallet.new('fixtures/448b451bc62e8e16.z')
-      GC.start
-      wallet.id
-      wallet.txns.count
-      test_log.debug("Memory: #{GetProcessMem.new.bytes.to_i}") if (i % 5).zero?
+    Zold::Hands.exec(20) do
+      40.times do |i|
+        wallet = Zold::Wallet.new('fixtures/448b451bc62e8e16.z')
+        GC.start
+        wallet.id
+        wallet.txns.count
+        test_log.debug("Memory: #{GetProcessMem.new.bytes.to_i}") if (i % 5).zero?
+      end
     end
     GC.stress = true
     diff = GetProcessMem.new.bytes.to_i - start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -627,6 +627,7 @@ files:
 - lib/zold/dir_items.rb
 - lib/zold/endless.rb
 - lib/zold/gem.rb
+- lib/zold/hands.rb
 - lib/zold/head.rb
 - lib/zold/hexnum.rb
 - lib/zold/http.rb
@@ -709,6 +710,7 @@ files:
 - test/test_copies.rb
 - test/test_dir_items.rb
 - test/test_gem.rb
+- test/test_hands.rb
 - test/test_hexnum.rb
 - test/test_http.rb
 - test/test_hungry_wallets.rb
@@ -744,7 +746,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.22.0!
+  Thanks for installing Zold 0.22.1!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io
@@ -817,6 +819,7 @@ test_files:
 - test/test_copies.rb
 - test/test_dir_items.rb
 - test/test_gem.rb
+- test/test_hands.rb
 - test/test_hexnum.rb
 - test/test_http.rb
 - test/test_hungry_wallets.rb