0mq 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 136e40f0d38d2aa86916cc8134140819f3b6153d
-  data.tar.gz: b9dc4d0d931e3069dcd6f72705d23276e5b96fd5
-SHA512:
-  metadata.gz: 6e78f5d97aac700192c295c5c246e310154c1a259d7f9e478552bcadf62daec60aee60994c8bba0cd8430fd872a7cd6f8de9bd73f577d7058fe0557b67198069
-  data.tar.gz: fedd23a1ff754f4e94da1388990633dea10b1b87b48951189093d3b801e5d4d24dfd6ce051c7330a10d1e77f4b536099fc87048ff3b01a4d3fe1cbf3ba3ef3d0
+--- 
+SHA1: 
+  metadata.gz: 4b23969552a6f935b9713b5be875a4dcb856ad06
+  data.tar.gz: 162abab4d33dfdbff296b777f8d20293a1ea1c14
+SHA512: 
+  metadata.gz: 80b4fa45c4a4a7df01aaca3bdc9bc2326f9ea1556ca3208fe554e4448df1df080c2e643c5b36a2d8a714aeb6ea4eaef01f0763582e7f8d5380f3043df01e843b
+  data.tar.gz: b4a71aaaa6c2e2120e4811ea4d1499a1e1d5329b47297f6287654ac0418774eaed38a6915e89726d35a0138d1d16b2457d1adf6e2b84501ec15aa18cdf4cd125

data/lib/0mq/error_check.rb

@@ -1,6 +1,33 @@
 
 module ZMQ
   
+  # "Native 0MQ error codes"
+  # Each is defined in zmq.h and is not a standard errno code
+  # Description for each error code is paraphrased from the zmq man pages
+  {
+    :EFSM           => "Finite state machine is in the wrong state",
+    :ENOCOMPATPROTO => "The requested protocol is not compatible",
+    :ETERM          => "The context was terminated",
+    :EMTHREAD       => "No I/O thread is available to accomplish the task",
+  }.each do |name, message|
+    klass = Class.new SystemCallError do
+      define_singleton_method :exception do |*args|
+        superclass.superclass.singleton_class
+        .instance_method(:new).bind(self).call(*args).tap { |exc|
+          exc.define_singleton_method(:message) { message }
+          exc.define_singleton_method(:to_s)    { message }
+          exc.define_singleton_method(:inspect) { 
+            "#<Errno::#{name}: #{message}>"
+          }
+        }
+      end
+    end
+    
+    klass.const_set :Errno, ZMQ.const_get(name)
+    Errno.const_set name, klass
+  end
+  
+  
   # A hash of error number => exception class.
   # Example: 1 => Errno::EPERM
   @error_map = Hash.new
@@ -16,7 +43,6 @@ module ZMQ
   # Example: ZMQ.error_check if rc == -1
   def self.error_check(adjust_backtrace=false)
     errno = LibZMQ.zmq_errno
-    return true if errno == 25 # TODO: What is this for? Remove?
     
     backtrace = adjust_backtrace ? caller[0...-2] : caller
     if @error_map.has_key? errno
@@ -26,4 +52,4 @@ module ZMQ
     end
   end
   
-end
+end

data/lib/0mq/poll_interruptible.rb

@@ -8,14 +8,21 @@ module ZMQ
     # Note that either #kill or #close MUST be called when done with the object.
     # There is no automatic finalizer for this object.
     def initialize(*sockets)
-      @int_sock_rep = ZMQ::Socket.new ZMQ::REP
-      @int_sock_req = ZMQ::Socket.new ZMQ::REQ
+      @int_sock_rep  = ZMQ::Socket.new ZMQ::REP
+      @int_sock_req  = ZMQ::Socket.new ZMQ::REQ
+      @int_sock_push = ZMQ::Socket.new ZMQ::PUSH
+      @int_sock_pull = ZMQ::Socket.new ZMQ::PULL
       
       # Choose an endpoint name that we can expect to be unique
       # so that they can be shared within the DefaultContext
       int_endpoint = "inproc://__PollInterruptible_int_"+hash.to_s(26)
-      @int_sock_rep.bind    int_endpoint
-      @int_sock_req.connect int_endpoint
+      
+      @int_sock_rep.bind     int_endpoint+'R'
+      @int_sock_req.connect  int_endpoint+'R'
+      @int_lock_req  = Mutex.new
+      @int_sock_pull.bind    int_endpoint+'P'
+      @int_sock_push.connect int_endpoint+'P'
+      @int_lock_push = Mutex.new
       
       # Interruption blocks are stored here by key until #run receives them.
       # After each is run, the return value is stored here in its place.
@@ -23,7 +30,7 @@ module ZMQ
       
       @dead = false
       
-      super @int_sock_rep, *sockets
+      super @int_sock_rep, @int_sock_pull, *sockets
     end
     
     # Same as Poll#run, but will yield [nil, nil] to the block if interrupted.
@@ -32,26 +39,35 @@ module ZMQ
       raise "#{self} cannot run; it was permanently killed." if @dead
       
       super do |socket, revents|
-        if socket == @int_sock_rep
+        if socket == @int_sock_rep || socket == @int_sock_pull
           key, * = socket.recv_array
           kill = key == "KILL"
+          blocking = socket == @int_sock_rep
           
           # Call the user block of #interrupt and store the return value
-          @interruptions[key] = @interruptions[key].call unless kill
+          unless kill
+            result = @interruptions[key].call
+            blocking ? @interruptions[key] = result : @interruptions.delete(key)
+          end
           
           # Call the user block of #run
           block.call nil, nil if block
           
-          socket.send_array ["OKAY"]
+          # Send a response if the interruption was blocking
+          socket.send_array ["OKAY"] if blocking
           
           if kill
             @int_sock_rep.close
+            @int_sock_pull.close
             @dead = true
           end
         else
           block.call socket, revents if block
         end
-      end.tap { |hash| hash.delete @int_sock_rep }
+      end.tap do |hash|
+        hash.delete @int_sock_rep
+        hash.delete @int_sock_pull
+      end
     end
     
     # Interrupt the running poll loop, but do not clean up.
@@ -60,16 +76,28 @@ module ZMQ
     #   and only if the poll thread is running
     # If a block is given, it will be executed in the poll thread just
     #   prior to the execution of the user block passed to {#run}.
-    def interrupt(&block)
+    # If the blocking: false option is is given, the call will not wait for
+    #   the interruption to be processed.
+    def interrupt(opts={}, &block)
+      blocking = opts.fetch :blocking, true
       block ||= Proc.new { true }
+      # block = block.dup
       key = block.object_id.to_s 36
       
       @interruptions[key] = block # Store the block to be called
       
-      @int_sock_req.send_string key # Signal an interruption to #run
-      @int_sock_req.recv_array      # Wait until it has been handled by #run
-      
-      @interruptions.delete key # Return the stored result of the block
+      if blocking
+        @int_lock_req.synchronize {
+          @int_sock_req.send_string key # Signal an interruption to #run
+          @int_sock_req.recv_array      # Wait until it has been handled by #run
+        }
+        return @interruptions.delete key # Return the stored result of the block
+      else
+        @int_lock_push.synchronize {
+          @int_sock_push.send_string key # Signal an interruption to #run
+        }
+        return nil
+      end
     end
     
     # Interrupt the running poll loop and permanently kill the Poll object
@@ -80,10 +108,13 @@ module ZMQ
     def kill
       return nil if @dead
       
-      @int_sock_req.send_array ["KILL"]
-      @int_sock_req.recv_array
+      @int_lock_req.synchronize do
+        @int_sock_req.send_array ["KILL"]
+        @int_sock_req.recv_array
+      end
       
       @int_sock_req.close
+      @int_sock_push.close
       
       true
     end
@@ -97,6 +128,8 @@ module ZMQ
       
       @int_sock_rep.close
       @int_sock_req.close
+      @int_sock_pull.close
+      @int_sock_push.close
       
       @dead = true
     end

metadata

@@ -1,134 +1,116 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: 0mq
-version: !ruby/object:Gem::Version
-  version: 0.5.2
+version: !ruby/object:Gem::Version 
+  version: 0.5.3
 platform: ruby
-authors:
+authors: 
 - Joe McIlvain
 - Alex McLain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-06-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ffi-rzmq-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.6"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "10.3"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rescue
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: pry-rescue
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec-its
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: fivemat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.8"
+  type: :development
+  version_requirements: *id009
 description: A Ruby-like wrapper for ffi-rzmq-core (ZeroMQ)
 email: joe.eli.mac@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
 - lib/0mq.rb
@@ -142,28 +124,31 @@ files:
 - lib/0mq/socket/options.rb
 - lib/0mq/version.rb
 homepage: https://github.com/jemc/0mq/
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id010 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id010
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 0mq
 test_files: []
+
 has_rdoc: