zoidberg 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32acff92e97fb082892e250a4e672adf569a2648
-  data.tar.gz: bda6511a8e52e778d0aefc0b7ca3485321cd5aac
+  metadata.gz: 63955382f221d56234b75d3e1993cb559975d767
+  data.tar.gz: 3039f9fd4a011778e47f4f5aa49e8ba25adf5083
 SHA512:
-  metadata.gz: 07941b9b12c199d8d0ecd87992ccefd1bbf2794006e2b1d980306b683f260b362c6d9e9359ea6da68bdbb94aef9580ed76725429b65192ea2610d591669def79
-  data.tar.gz: 949f2f5f6e5886da400828ca3b1eef2f4c556f6d0e748e6dc6fa77a0a0a2c6111260c67b6fcf7c7f7a57675ac52d145eeb7fd456fbb3512212c216f770ad8259
+  metadata.gz: 34a88ecf7b4d6bd6c97d7199eac16a4f3dab30e3e1747d1be07049ec29e3924d48f3b520abcc95115d3a4272f0e9142b7c88bab994a1c5347183e9ce9dda5861
+  data.tar.gz: 8931326058903b2a82fc0b517bee6e22174a3037b444b6e4c2ae88807470170bb5a1a71eb2c4d26ca3d521a9685310e372a47129f141f0f46d3d10243a058d29

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.0
+* Initial internal refactor utilizing ruby-concurrent
+
 # v0.2.2
 * Remove async threads once they have reached completion
 * Attempt to locate free worker in pool for async, random pick if none

data/lib/zoidberg.rb

@@ -1,6 +1,8 @@
 require 'bogo'
-require 'thread'
 require 'securerandom'
+require 'concurrent'
+require 'concurrent-edge'
+
 require 'zoidberg/version'
 
 # Why not Zoidberg!?
@@ -24,7 +26,9 @@ module Zoidberg
 
   class << self
 
-    attr_accessor :signal_shutdown
+    # @return [TrueClass, FalseClass]
+    attr_reader :signal_shutdown
+    # @return [Module]
     attr_accessor :default_shell
 
     # @return [Zoidberg::Logger]
@@ -48,10 +52,28 @@ module Zoidberg
       SecureRandom.uuid
     end
 
+    # Flag shutdown state
+    #
+    # @param val [Truthy, Falsey]
+    # @return [TrueClass, FalseClass]
+    def signal_shutdown=(val)
+      @signal_shutdown = !!val
+      # NOTE: Manually call registered at exit items to force
+      # global thread pools and related structures to be shut
+      # down. Wrapped in a thread to prevent locking issues
+      # when set within trap context
+      Thread.new{ Concurrent.const_get(:AtExit).run } if val
+      @signal_shutdown
+    end
+
+    # Reset shutdown state
+    #
+    # @return [FalseClass]
     def signal_reset
       self.signal_shutdown = false
     end
 
+    # @return [TrueClass, FalseClass]
     def in_shutdown?
       !!self.signal_shutdown
     end

data/lib/zoidberg/future.rb

@@ -4,21 +4,21 @@ module Zoidberg
   # Perform action and fetch result in the future
   class Future
 
-    # @return [Thread] underlying thread running task
-    attr_reader :thread
+    # @return [Concurrent::Future] underlying thread running task
+    attr_reader :future
 
     # Create a new instance
     #
     # @yield block to execute
     # @return [self]
     def initialize(&block)
-      @thread = Thread.new(&block)
+      @future = Concurrent::Future.execute(&block)
     end
 
     # @return [Object] result value
     def value
       unless(@value)
-        @value = @thread.value
+        @value = @future.value
       end
       @value
     end
@@ -27,7 +27,7 @@ module Zoidberg
     #
     # @return [TrueClass, FalseClass]
     def available?
-      !thread.alive?
+      future.fulfilled?
     end
 
   end

data/lib/zoidberg/pool.rb

@@ -76,7 +76,7 @@ module Zoidberg
     end
 
     # Proxy async to prevent synchronized access
-    def async(*args,&block)
+    def async(*args, &block)
       worker = _workers.detect(&:_zoidberg_available?) || _workers.sample
       worker.send(:async, *args, &block)
     end

data/lib/zoidberg/proxy/liberated.rb

@@ -10,8 +10,8 @@ module Zoidberg
 
       # @return [Thread] current owner of lock
       attr_reader :_locker
-      # @return [Hash<Integer:Thread>]
-      attr_reader :_raw_threads
+      # @return [Concurrent::CachedThreadPool]
+      attr_reader :_thread_pool
 
       # Create a new proxy instance, new real instance, and link them
       #
@@ -24,7 +24,7 @@ module Zoidberg
         @_locker = nil
         @_locker_count = 0
         @_zoidberg_signal = nil
-        @_raw_threads = []
+        @_thread_pool = ::Concurrent::CachedThreadPool.new
         @_supervised = klass.ancestors.include?(::Zoidberg::Supervise)
       end
 
@@ -85,25 +85,6 @@ module Zoidberg
         !_zoidberg_locked?
       end
 
-      # Register a running thread for this instance. Registered
-      # threads are tracked and killed on cleanup
-      #
-      # @param thread [Thread]
-      # @return [TrueClass]
-      def _zoidberg_thread(thread)
-        _raw_threads.push(thread)
-        true
-      end
-
-      # Deregister a thread once it has completed
-      #
-      # @param thread [Thread]
-      # @return [TrueClass]
-      def _zoidberg_unthread(thread)
-        _raw_threads.delete(thread)
-        true
-      end
-
       # Aquire the lock to access real instance. If already locked, will
       # wait until lock can be aquired.
       #
@@ -151,16 +132,9 @@ module Zoidberg
         oid = _raw_instance.object_id
         ::Zoidberg.logger.debug "*** Destroying zoidberg instance #{object_string}"
         super do
-          _raw_threads.map do |thread|
-            thread.raise ::Zoidberg::DeadException.new('Instance in terminated state!', oid)
-            ::Thread.new(thread) do |thread|
-              next if thread == ::Thread.current
-              thread.join(::Zoidberg::Proxy::Liberated::THREAD_KILL_AFTER)
-              if(thread.alive?)
-                ::Zoidberg.logger.error "Failed to halt async thread, killing: #{thread.inspect}"
-                thread.kill
-              end
-            end
+          _thread_pool.shutdown
+          unless(_thread_pool.wait_for_termination(2))
+            _thread_pool.kill
           end
           @_accessing_threads.each do |thread|
             if(thread.alive?)

data/lib/zoidberg/shell.rb

@@ -37,27 +37,24 @@ module Zoidberg
         @target = proxy._raw_instance
       end
       def method_missing(*args, &block)
-        target._zoidberg_thread(
-          Thread.new{
-            got_lock = false
-            begin
-              origin_proxy._aquire_lock! if locked
-              got_lock = locked
-              target.send(*args, &block)
-            rescue Zoidberg::DeadException => e
-              if(e.origin_object_id == target.object_id)
-                got_lock = false
-              end
-              raise
-            rescue StandardError, ScriptError => e
-              origin_proxy._zoidberg_unexpected_error(e)
-              raise
-            ensure
-              origin_proxy._release_lock! if got_lock
-              origin_proxy._zoidberg_unthread(Thread.current)
+        origin_proxy._thread_pool << lambda{
+          got_lock = false
+          begin
+            origin_proxy._aquire_lock! if locked
+            got_lock = locked
+            target.send(*args, &block)
+          rescue Zoidberg::DeadException => e
+            if(e.origin_object_id == target.object_id)
+              got_lock = false
             end
-          }
-        )
+            raise
+          rescue StandardError, ScriptError => e
+            origin_proxy._zoidberg_unexpected_error(e)
+            raise
+          ensure
+            origin_proxy._release_lock! if got_lock
+          end
+        }
         nil
       end
     end
@@ -89,7 +86,7 @@ module Zoidberg
     def async(locked=false, &block)
       if(block_given?)
         unless(locked)
-          thread = ::Thread.new do
+          _zoidberg_proxy._thread_pool << lambda{
             begin
               self.instance_exec(&block)
             rescue Zoidberg::DeadException => e
@@ -103,9 +100,9 @@ module Zoidberg
               _zoidberg_proxy._zoidberg_unexpected_error(e)
               raise
             end
-          end
+          }
         else
-          thread = ::Thread.new do
+          _zoidberg_proxy._thread_pool << lambda{
             _zoidberg_proxy._aquire_lock!
             begin
               got_lock = true
@@ -123,25 +120,14 @@ module Zoidberg
             ensure
               _zoidberg_proxy._release_lock! if got_lock
             end
-          end
+          }
         end
-        _zoidberg_thread(thread)
         nil
       else
         ::Zoidberg::SoftShell::AsyncProxy.new(locked, _zoidberg_proxy)
       end
     end
 
-    # Register a running thread for this instance. Registered
-    # threads are tracked and killed on cleanup
-    #
-    # @param thread [Thread]
-    # @return [TrueClass]
-    def _zoidberg_thread(thread)
-      _zoidberg_proxy._zoidberg_thread(thread)
-      true
-    end
-
     # Provide a customized sleep behavior which will unlock the real
     # instance while sleeping
     #

data/lib/zoidberg/timer.rb

@@ -66,6 +66,11 @@ module Zoidberg
         )
       end
 
+      # @return [Float] reset the action
+      def reset
+        @last_run = Time.now.to_f
+      end
+
     end
 
     include Zoidberg::SoftShell

data/lib/zoidberg/version.rb

@@ -1,4 +1,4 @@
 module Zoidberg
   # Current library version
-  VERSION = Gem::Version.new('0.2.2')
+  VERSION = Gem::Version.new('0.3.0')
 end

data/zoidberg.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'bogo'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.0'
+  s.add_runtime_dependency 'concurrent-ruby-edge', '~> 0.2.0'
   s.add_runtime_dependency 'mono_logger'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoidberg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-edge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
@@ -119,3 +147,4 @@ signing_key:
 specification_version: 4
 summary: Why not?
 test_files: []
+has_rdoc: