nanoc-core 4.11.17 → 4.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748b150c5ee93de8c4ce8dcd31ddc4e4dc64897a73d86dd91be9d743b1ff476d
-  data.tar.gz: '008722ff9d57b3c5e13fda3e5ac60dd4860a1240076383067a37664ebb7df2ca'
+  metadata.gz: bd4fffaf7813aba1bc2544b16ff1cf801f141a293605c4cd3a4f44d26e6baf02
+  data.tar.gz: a11c2bd8d095dbfcfddc00628cf2a65115184dee3cbedd3ea956d17ce0551f57
 SHA512:
-  metadata.gz: 49b011afe4838c9150bd91ccaf17acd7150f5d143af69b13e623f542ff2af7965205f4b2a595b07e651babada9e902a98e2c879f923070be21c14fd199c5674d
-  data.tar.gz: aefeed726b1ac55565446d4fc7ccce5a3d5293029ad7b0e534e33f8f0ff338d0f7d8f9641dfd964125e5a71dbb243aa95e9cf447d071478fea03d1e2a485ea4c
+  metadata.gz: 26a6cf153b5cb6c2fc0c12e1597ab4a77dd6ff52cf95fa90e9b636f684caf819e883677cfbe3d60a179f2f87c548be5a4f436c56f2e981b2691908163844628a
+  data.tar.gz: 2b2dcbaf7d2b0c41a7d9558af9b33c3e7eafa5b8986ec230fb31c74c916beb4912872f80ffa63f02eea9558c60f5e4723ee08d71ece1731ae8d107b5e847b990

data/lib/nanoc/core.rb

@@ -9,6 +9,7 @@ require 'tmpdir'
 require 'yaml'
 
 # External gems
+require 'concurrent-ruby'
 require 'json_schema'
 require 'ddmemoize'
 require 'ddmetrics'

data/lib/nanoc/core/compilation_phases/write.rb

@@ -6,45 +6,6 @@ module Nanoc
       class Write < Abstract
         include Nanoc::Core::ContractsSupport
 
-        class Worker
-          def initialize(queue:, compiled_content_store:)
-            @queue = queue
-            @compiled_content_store = compiled_content_store
-          end
-
-          def start
-            @thread = Thread.new do
-              Thread.current.abort_on_exception = true
-              Thread.current.priority = -1 # schedule I/O work ASAP
-
-              writer = Nanoc::Core::ItemRepWriter.new
-
-              while rep = @queue.pop # rubocop:disable Lint/AssignmentInCondition
-                writer.write_all(rep, @compiled_content_store)
-              end
-            end
-          end
-
-          def join
-            @thread.join
-          end
-        end
-
-        class WorkerPool
-          def initialize(queue:, size:, compiled_content_store:)
-            @workers = Array.new(size) { Worker.new(queue: queue, compiled_content_store: compiled_content_store) }
-          end
-
-          def start
-            @workers.each(&:start)
-          end
-
-          def join
-            @workers.each(&:join)
-          end
-        end
-
-        QUEUE_SIZE = 40
         WORKER_POOL_SIZE = 5
 
         def initialize(compiled_content_store:, wrapped:)
@@ -52,19 +13,16 @@ module Nanoc
 
           @compiled_content_store = compiled_content_store
 
-          @queue = SizedQueue.new(QUEUE_SIZE)
-          @worker_pool = WorkerPool.new(queue: @queue, size: WORKER_POOL_SIZE, compiled_content_store: @compiled_content_store)
-        end
+          @pool = Concurrent::FixedThreadPool.new(WORKER_POOL_SIZE)
 
-        def start
-          super
-          @worker_pool.start
+          @writer = Nanoc::Core::ItemRepWriter.new
         end
 
         def stop
+          @pool.shutdown
+          @pool.wait_for_termination
+
           super
-          @queue.close
-          @worker_pool.join
         end
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
@@ -76,7 +34,9 @@ module Nanoc
           # notification happens before the :rep_write_enqueued one.
           Nanoc::Core::NotificationCenter.post(:rep_write_enqueued, rep)
 
-          @queue << rep
+          @pool.post do
+            @writer.write_all(rep, @compiled_content_store)
+          end
         end
       end
     end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.11.17'
+    VERSION = '4.11.18'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.11.17
+  version: 4.11.18
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ddmemoize
   requirement: !ruby/object:Gem::Requirement