zoidberg 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3632fd491e21d5b71dca06d2670227b281b27865
-  data.tar.gz: 360be229f5e280316a28b6505b80e08fba50220b
+  metadata.gz: 08a8fcac4a08bd3faf0b9df558810aff252ad731
+  data.tar.gz: 592ee902246aa7894b9a06e3fe5a1a5004cd79cf
 SHA512:
-  metadata.gz: f3d3c32e84acbd7b470f16166b070b8bf219d3db1d548eeb25bb758e9675c1b8b864ec45cbe5b4536b402147ce6b0513cefbb5af2008855eea4af48a21c29366
-  data.tar.gz: 3bd1a5562bdab8f04ac8f0e1381b1db7aa10c33cb0e1f83e334802cf348b329dae5e6091052b875efab3b3c740371620147c679dcbdb72962f5cb690321fa15c
+  metadata.gz: 30c31fccb644651b16bcb4800950abaad291a1c889e0610e35eda0544478b9b36d4395ded8689965ad6f27b25b3948e690bd051e7b4edb5f86013779595dd5e4
+  data.tar.gz: da72c8a5e1e394cd6acdd2898aa7e647da58478d5408c6b4f2c741fac92705fc1efe641d8cb729f2913f69bdbfcf66d8d30c9cebafd2f7b99e77eccab9a61cc9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.1.6
+* Add Zoidberg::Lazy
+* Explicitly state what shells are used internally
+* DRY raw instance wrapping
+* Flag signal context and disable any locking
+
 # v0.1.4
 * Timer updates and fix spec
 

data/lib/zoidberg.rb

@@ -7,6 +7,7 @@ require 'zoidberg/version'
 module Zoidberg
   autoload :DeadException, 'zoidberg/shell'
   autoload :Future, 'zoidberg/future'
+  autoload :Lazy, 'zoidberg/lazy'
   autoload :Logger, 'zoidberg/logger'
   autoload :Pool, 'zoidberg/pool'
   autoload :Proxy, 'zoidberg/proxy'
@@ -23,6 +24,7 @@ module Zoidberg
 
   class << self
 
+    attr_accessor :signal_shutdown
     attr_accessor :default_shell
 
     # @return [Zoidberg::Logger]
@@ -46,6 +48,14 @@ module Zoidberg
       SecureRandom.uuid
     end
 
+    def signal_reset
+      self.signal_shutdown = false
+    end
+
+    def in_shutdown?
+      !!self.signal_shutdown
+    end
+
   end
 
 end
@@ -54,3 +64,9 @@ end
 Zoidberg.logger = Zoidberg::Logger.new(STDERR)
 # Set default shell to soft shell
 Zoidberg.default_shell = Zoidberg::SoftShell
+
+%w(INT TERM).each do |sig_name|
+  Signal.trap(sig_name) do |*_|
+    Zoidberg.signal_shutdown = true
+  end
+end

data/lib/zoidberg/lazy.rb

@@ -0,0 +1,56 @@
+require 'zoidberg'
+
+module Zoidberg
+
+  # Provide lazy evaluation of an instance for future work
+  class Lazy < BasicObject
+
+    # Create a new lazy evaluator
+    #
+    # @param klass [Class] optional class to use for type checkin
+    # @yield block to provide actual instance
+    # @return [self]
+    def initialize(klass=nil, &block)
+      @klass = klass
+      @lock = ::Mutex.new
+      unless(block)
+        ::Kernel.raise ::ArgumentError.new('Block is required for providing instance!')
+      end
+      @instance_block = block
+    end
+
+    # Proxy any calls to actual instance
+    def method_missing(*args, &block)
+      _lazy_instance.send(*args, &block)
+    end
+
+    # Customized check to allow for type checking prior to instance
+    # being available via lazy loading
+    #
+    # @param chk [Class]
+    # @return [TrueClass, FalseClass]
+    def is_a?(chk)
+      if(@klass)
+        ([@klass] + @klass.ancestors).include?(chk)
+      else
+        method_missing(:is_a?, chk)
+      end
+    end
+
+    private
+
+    # @return [Object]
+    def _lazy_instance
+      @lock.synchronize do
+        unless(@instance)
+          until(@instance = @instance_block.call)
+            ::Kernel.sleep(0.1)
+          end
+        end
+        @instance
+      end
+    end
+
+  end
+
+end

data/lib/zoidberg/pool.rb

@@ -5,7 +5,7 @@ module Zoidberg
   # instances within the pool
   class Pool
 
-    include Zoidberg::Shell
+    include Zoidberg::SoftShell
 
     # @return [Array<Object>] workers within pool
     attr_reader :_workers

data/lib/zoidberg/proxy.rb

@@ -53,11 +53,31 @@ module Zoidberg
       raise NotImplementedError
     end
 
+    # Set the raw instance into the proxy and link proxy to instance
+    #
+    # @param inst [Object] raw instance being wrapped
+    # @return [NilClass]
+    def _zoidberg_set_instance(inst)
+      @_raw_instance = inst
+      @_raw_instance._zoidberg_proxy(self)
+      nil
+    end
+
     # @return [TrueClass, FalseClass] currently locked
     def _zoidberg_locked?
       false
     end
 
+    # @return [TrueClass]
+    def _aquire_lock!
+      true
+    end
+
+    # @return [TrueClass]
+    def _release_lock!
+      true
+    end
+
     # @return [TrueClass, FalseClass] currently unlocked
     def _zoidberg_available?
       !_zoidberg_locked?
@@ -99,6 +119,7 @@ module Zoidberg
     # @param e [Exception]
     def _zoidberg_unexpected_error(e)
       ::Zoidberg.logger.error "Unexpected exception: #{e.class} - #{e}"
+      ::Zoidberg.logger.debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
       unless((defined?(Timeout) && e.is_a?(Timeout::Error)) || e.is_a?(::Zoidberg::DeadException))
         if(_zoidberg_link)
           if(_zoidberg_link.class.trap_exit)
@@ -131,25 +152,24 @@ module Zoidberg
     # @param error [Exception] exception that was caught
     # @return [TrueClass]
     def _zoidberg_handle_unexpected_error(error)
-      if(_raw_instance.respond_to?(:restart))
-        begin
-          _raw_instance.restart(error)
-          return # short circuit
-        rescue => e
+      unless(::Zoidberg.in_shutdown?)
+        if(_raw_instance.respond_to?(:restart))
+          begin
+            _raw_instance.restart(error)
+            return # short circuit
+          rescue => e
+          end
         end
+        _zoidberg_destroy!
+        _aquire_lock!
+        args = _build_args.dup
+        inst = args.shift.unshelled_new(*args.first, &args.last)
+        _zoidberg_set_instance(inst)
+        if(_raw_instance.respond_to?(:restarted!))
+          _raw_instance.restarted!
+        end
+        _release_lock!
       end
-      _zoidberg_destroy!
-      _aquire_lock!
-      args = _build_args.dup
-      @_raw_instance = args.shift.unshelled_new(
-        *args.first,
-        &args.last
-      )
-      _raw_instance._zoidberg_proxy(self)
-      if(_raw_instance.respond_to?(:restarted!))
-        _raw_instance.restarted!
-      end
-      _release_lock!
       true
     end
 
@@ -189,7 +209,6 @@ module Zoidberg
         _raw_instance.send(:define_singleton_method, :to_s, &death_from_above_display)
         _raw_instance.send(:define_singleton_method, :inspect, &death_from_above_display)
         _raw_instance.send(:define_singleton_method, :_zoidberg_destroyed, ::Proc.new{ true })
-        _zoidberg_signal(:destroyed)
       end
       true
     end

data/lib/zoidberg/proxy/confined.rb

@@ -9,6 +9,8 @@ module Zoidberg
       attr_reader :_source_thread
       # @return [Queue] current request queue
       attr_reader :_requests
+      # @return [Queue] result queue
+      attr_reader :_results
       # @return [TrueClass, FalseClass] blocked running task
       attr_reader :_blocked
 
@@ -18,6 +20,7 @@ module Zoidberg
       # @return [self]
       def initialize(klass, *args, &block)
         @_requests = ::Queue.new
+        @_results = ::Queue.new
         @_blocked = false
         @_source_thread = ::Thread.new do
           ::Zoidberg.logger.debug 'Starting the isolation request processor'
@@ -25,11 +28,7 @@ module Zoidberg
           _isolate!
         end
         @_build_args = [klass, *args, block]
-        @_raw_instance = klass.unshelled_new(*args, &block)
-        @_raw_instance._zoidberg_proxy(self)
-        if(@_raw_instance.class.include?(::Zoidberg::Supervise))
-          @_supervised = true
-        end
+        @_supervised = klass.include?(::Zoidberg::Supervise)
         ::Zoidberg.logger.debug "Zoidberg object isolation wrap: #{@_build_args.inspect}"
       end
 
@@ -44,7 +43,7 @@ module Zoidberg
           :block => block,
           :response => nil,
           :async => true,
-          :blocking => blocking == :blocking
+          :blocked => !!blocking
         )
         nil
       end
@@ -102,22 +101,41 @@ module Zoidberg
         end
       end
 
+      # @return [TrueClass, FalseClass]
       def _zoidberg_available?
         !_blocked
       end
 
+      # @return [TrueClass, FalseClass]
+      def threaded?
+        ::Thread.current != _source_thread
+      end
+
+      def task_defer(wait_task)
+        _results << wait_task
+      end
+
+      def inspect
+        _raw_instance.inspect
+      end
+
+      def to_s
+        _raw_inspect.to_s
+      end
+
       protected
 
       # Process requests
       def _isolate!
         begin
           ::Kernel.loop do
+            item = _requests.pop
             begin
-              _process_request(_requests.pop)
+              _process_request(item)
             rescue => e
               ::Zoidberg.logger.error "Unexpected looping error! (#{e.class}: #{e})"
-              ::Zoidberg.logger.error "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-              ::Thread.main.raise e
+              ::Zoidberg.logger.debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+              item.push(e)
             end
           end
         ensure
@@ -130,43 +148,57 @@ module Zoidberg
       # Process a request
       #
       # @param request [Hash]
-      # @return [self]
+      # @return [NilClass]
       def _process_request(request)
         begin
           @_blocked = !request[:async]
           ::Zoidberg.logger.debug "Processing received request: #{request.inspect}"
           unless(request[:task])
-            request[:task] = ::Zoidberg::Task.new(request[:async] ? :async : :serial, _raw_instance, [request]) do |req|
+            if(request[:response])
+              request[:result] = _results
+            end
+            request[:task] = ::Zoidberg::Task.new(!self.class.option?(:evented) || request[:async] ? :async : :serial, _raw_instance, [request]) do |req|
               begin
                 result = origin.__send__(
                   *req[:arguments],
                   &req[:block]
                 )
                 if(req[:response])
-                  req[:response] << result
+                  req[:result] << result
                 end
               rescue ::Exception => exception
                 if(req[:response])
-                  req[:response] << exception
+                  req[:result] << exception
                 end
               end
             end
           end
-          if(request[:task].waiting?)
+          if(!request[:task_defer] || request[:task_defer].complete?)
             if(_raw_instance.alive?)
-              request[:task].proceed
-              request[:task].value if request[:blocking]
+              if(request[:task].waiting?)
+                request[:task].proceed
+              end
+              if(!request[:async] || request[:blocking])
+                val = _results.pop
+                if(val.is_a?(::Zoidberg::Task))
+                  ::Thread.new do
+                    val.value
+                    _requests.push(request)
+                  end
+                else
+                  request[:response].push(val)
+                  ::Zoidberg.logger.debug "Request processing completed. #{request.inspect}"
+                end
+              end
             else
               request[:response] << ::Zoidberg::DeadException.new('Instance in terminated state!')
               request[:task].halt!
             end
           end
-          _requests.push(request) unless request[:task].complete? || request[:async]
-          ::Zoidberg.logger.debug "Request processing completed. #{request.inspect}"
         ensure
           @_blocked = false
         end
-        self
+        nil
       end
 
     end

data/lib/zoidberg/proxy/liberated.rb

@@ -21,12 +21,8 @@ module Zoidberg
         @_locker = nil
         @_locker_count = 0
         @_zoidberg_signal = nil
-        @_raw_instance = klass.unshelled_new(*args, &block)
-        @_raw_instance._zoidberg_proxy(self)
         @_raw_threads = ::Smash.new{ ::Array.new }
-        if(@_raw_instance.class.ancestors.include?(::Zoidberg::Supervise))
-          @_supervised = true
-        end
+        @_supervised = klass.ancestors.include?(::Zoidberg::Supervise)
       end
 
       # Used to proxy request to real instance

data/lib/zoidberg/registry.rb

@@ -2,6 +2,6 @@ require 'zoidberg'
 
 module Zoidberg
   class Registry < Bogo::Smash
-    include Zoidberg::Shell
+    include Zoidberg::SoftShell
   end
 end

data/lib/zoidberg/shell.rb

@@ -132,9 +132,16 @@ module Zoidberg
     # @yield block to execute without lock
     # @return [Object] result of block
     def defer(&block)
-      Fiber.yield
-      if(block)
-        ::Fiber.new(&block).resume
+      if(current_self.threaded?)
+        action = Task.new(:async, current_self){ block.call }
+        current_self.task_defer(action)
+        Thread.stop
+        action.value
+      else
+        Fiber.yield
+        if(block)
+          ::Fiber.new(&block).resume
+        end
       end
     end
 
@@ -162,7 +169,7 @@ module Zoidberg
     def sleep(length=nil)
       start_time = ::Time.now.to_f
       if(length)
-        ::Kernel.sleep(length)
+        defer{ ::Kernel.sleep(length) }
       else
         ::Thread.current[:root_fiber] == ::Fiber.current ? ::Kernel.sleep : ::Fiber.yield
       end
@@ -258,7 +265,11 @@ module Zoidberg
         if(oxy)
           @_zoidberg_proxy = oxy
         end
-        @_zoidberg_proxy
+        if(@_zoidberg_proxy)
+          @_zoidberg_proxy
+        else
+          Lazy.new(self.class){ @_zoidberg_proxy }
+        end
       end
       alias_method :current_self, :_zoidberg_proxy
       alias_method :current_actor, :_zoidberg_proxy
@@ -286,6 +297,7 @@ module Zoidberg
         else
           raise TypeError.new "Unable to determine `Shell` type for this class `#{self}`!"
         end
+        proxy._zoidberg_set_instance(self.unshelled_new(*args, &block))
         weak_ref = Zoidberg::WeakRef.new(proxy)
         Zoidberg::Proxy.register(weak_ref.__id__, proxy)
         ObjectSpace.define_finalizer(weak_ref, Zoidberg::Proxy.method(:scrub!))

data/lib/zoidberg/supervisor.rb

@@ -3,7 +3,7 @@ require 'zoidberg'
 module Zoidberg
   class Supervisor
 
-    include Zoidberg::Shell
+    include Zoidberg::SoftShell
 
     # @return [Registry] current supervision registry
     attr_reader :registry

data/lib/zoidberg/task.rb

@@ -140,6 +140,10 @@ module Zoidberg
           raise
         end
       end
+      until(@task.stop?)
+        sleep(0.01)
+      end
+      @task
     end
 
   end

data/lib/zoidberg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoidberg
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -78,6 +78,7 @@ files:
 - README.md
 - lib/zoidberg.rb
 - lib/zoidberg/future.rb
+- lib/zoidberg/lazy.rb
 - lib/zoidberg/logger.rb
 - lib/zoidberg/pool.rb
 - lib/zoidberg/proxy.rb
@@ -113,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Why not?
 test_files: []
-has_rdoc: