pwork 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f4c565cd3cbbe417681e9a2b4a4809efe4423652af4f8ecaa7e7e989b87dabe
-  data.tar.gz: ef49af7bb9a4212bce14de2676345bc42fb6db16cda9b270d856344d66da6a58
+  metadata.gz: 83211819e79a3fa139b22dec319bdc104cd26a4740c0a12b1e98beac4bb46858
+  data.tar.gz: 322a1b55a085eea1bb48c54f46f2180cbef93d812e63c0a2d960111bb25a5715
 SHA512:
-  metadata.gz: 7201204d08a15b4fd655d4e92811dd0226ded7055b355a565acca60fd6250430e98d158310b0bd5df15edc009f0c746e59abcbf25f7aea88a42fa1762c4793d0
-  data.tar.gz: 2aa3d668f78be0fc8bd7e7c0a21e90010b4e2bc58a58dc7a0cbe0991546c16a3762697b8a4c111f7762551352e2f52a0a00a0a29dd6f8d077c12fa34bcd5f7aa
+  metadata.gz: 6d0f8d800344762f067c498f7969541a35b511663339639f92dbf4831fdf10e1ccc97a4aeb2f78443f2795b0fdfc724233805bc7070fbb1a32fd7210b422ed29
+  data.tar.gz: 2a951e58edc74b7efc65f0bc3ba55acc88418b4b14efd16f514d458077a834756440acf5de31f99d1e61999ba9fc4cd1cef8d51251038a08f050ac5de01ceff4

data/lib/pwork/async.rb

@@ -11,7 +11,7 @@ module PWork
         when 'test'
           PWork::Async.async_test(options, &block)
         else
-          PWork::Async.async_threaded(options, &block)
+          PWork::Async.async_threaded(options, self, &block)
       end
     end
 
@@ -33,12 +33,12 @@ module PWork
       end
     end
 
-    def self.async_threaded(options = {}, &block)
+    def self.async_threaded(options = {}, caller, &block)
       if block_given?
-        options[:caller] = self
+        options[:caller] = caller
         PWork::Async.add_task(options, &block)
       else
-        PWork::Async.wait_for_tasks({ caller: self, command: options })
+        PWork::Async.wait_for_tasks({ caller: caller, command: options })
       end
     end
 
@@ -47,8 +47,6 @@ module PWork
     end
 
     def self.add_task(options, &block)
-      manager.start unless manager.running
-
       task = PWork::Async::Task.new.tap do |e|
         e.block = block
         e.caller = options[:caller]
@@ -75,9 +73,7 @@ module PWork
           task_list = tasks.select { |t| t.caller == options[:caller] }
       end
 
-      until task_list.detect { |t| t.state == :pending || t.state == :active }.nil?
-        sleep(async_wait_sleep_iteration)
-      end
+      task_list.each { |t| t.thread.join }
 
       handle_errors
 
@@ -96,10 +92,6 @@ module PWork
       true
     end
 
-    def self.async_wait_sleep_iteration
-      Float(ENV.fetch('PWORK_ASYNC_WAIT_SLEEP_ITERATION', '0.02'))
-    end
-
     def self.mode
       ENV.fetch('PWORK_ASYNC_MODE', 'thread').to_s.downcase
     end

data/lib/pwork/async/manager.rb

@@ -3,53 +3,20 @@ require 'thread'
 module PWork
   module Async
     class Manager
-      def initialize
-        @queue = Queue.new
-        @threads = []
-        @running = false
-      end
-
-      # This method is called to determine if this manager is running or not
-      def running
-        @running
-      end
-
-      # This method is called to start the async manager
-      def start
-        @running = true
-        pool_size.times do
-          @threads << Thread.new do
-            until @running == false
-              process_task
-            end
-          end
-        end
-      end
-
-      # This method is called to stop the async manager
-      def stop
-        @running = false
-        @threads = []
-      end
-
-      # This method is called to determine the size of the async thread pool
-      def pool_size
-        Integer(ENV.fetch('PWORK_ASYNC_POOL_SIZE', 10))
-      end
-
       # This method is called to process an async task from the queue
-      def process_task
-        task = @queue.pop
-        task.state = :active
-        thread_helper.set_thread_vars(task.thread_local_storage)
-        begin
-          task.block.call
-          task.state = :complete
-        rescue => e
-          task.error = e
-          task.state = :error
-        ensure
-          thread_helper.reset_thread_vars
+      def process_task(task)
+        task.thread = Thread.new do
+          task.state = :active
+          thread_helper.set_thread_vars(task.thread_local_storage)
+          begin
+            task.block.call
+            task.state = :complete
+          rescue => e
+            task.error = e
+            task.state = :error
+          ensure
+            thread_helper.reset_thread_vars
+          end
         end
       end
 
@@ -58,18 +25,13 @@ module PWork
         PWork::Helpers::Threads
       end
 
-      # This method is called to determine the number of tasks in the queue
-      def queue_count
-        @queue.length
-      end
-
       # This method is called to add a task to the queue
       def add_task(task)
         raise PWork::Async::Exceptions::InvalidOptionsError.new(
           'A valid async task must be specified.'
         ) unless task.is_a?(PWork::Async::Task)
         task.thread_local_storage = PWork::Helpers::Threads.get_thread_vars
-        @queue.push(task)
+        process_task(task)
       end
     end
   end

data/lib/pwork/async/task.rb

@@ -8,10 +8,11 @@ module PWork
       attr_accessor :error
       attr_accessor :block
       attr_accessor :caller
+      attr_accessor :thread
       def initialize
         self.id = SecureRandom.uuid
         self.state = :pending
-        self.thread_local_storage = []
+        self.thread_local_storage = {}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwork
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - vaughanbrittonsage