ffi-rzmq 0.5.0 → 0.5.1

data/examples/xreqxrep_poll.rb

@@ -0,0 +1,82 @@
+require 'rubygems'
+require 'ffi-rzmq'
+
+
+link = "tcp://127.0.0.1:5555"
+
+ctx = ZMQ::Context.new 1
+s1 = ctx.socket ZMQ::XREQ
+s1.identity = 'socket1.xreq'
+s2 = ctx.socket ZMQ::XREP
+s2.identity = 'socket2.xrep'
+s3 = ctx.socket ZMQ::XREP
+s3.identity = 'socket3.xrep'
+
+s1.bind link
+s2.connect link
+#s3.connect link
+
+poller = ZMQ::Poller.new
+#poller.register_readable s3
+poller.register_readable s2
+poller.register_writable s1
+
+start_time = Time.now
+@unsent = true
+
+until @done do
+  begin
+    poller.poll_nonblock
+  rescue ZMQ::PollError => e
+    puts "efault? [#{e.efault?}]"
+    raise
+  end
+
+  # send the message after 5 seconds
+  if Time.now - start_time > 5 && @unsent
+    puts "sending payload nonblocking"
+
+    5.times do |i|
+      payload = "#{ i.to_s * 40 }"
+      s1.send_string payload, ZMQ::NOBLOCK
+    end
+    @unsent = false
+  end
+
+  # check for messages after 1 second
+  if Time.now - start_time > 1
+    poller.readables.each do |sock|
+      #p poller.readables
+      puts
+      #p poller.writables
+      if sock.identity =~ /xrep/
+        routing_info = sock.recv_string ZMQ::NOBLOCK
+        puts "routing_info received [#{routing_info}] on socket.identity [#{sock.identity}]"
+      else
+        routing_info = nil
+        received_msg = sock.recv_string ZMQ::NOBLOCK
+        
+        # skip to the next iteration if received_msg is nil; that means we got an EAGAIN
+        next unless received_msg
+        puts "message received [#{received_msg}] on socket.identity [#{sock.identity}]"
+      end
+
+      while sock.more_parts? do
+        received_msg = sock.recv_string ZMQ::NOBLOCK
+
+        puts "message received [#{received_msg}]"
+      end
+
+      puts "kick back a reply"
+      sock.send_string routing_info, ZMQ::SNDMORE | ZMQ::NOBLOCK if routing_info
+      time = Time.now.strftime "%Y-%m-%dT%H:%M:%S.#{Time.now.usec}"
+      reply = "reply " + sock.identity.upcase + " #{time}"
+      puts "sent reply [#{reply}], #{time}"
+      sock.send_string reply
+      #@done = true
+      poller.register_readable s1
+    end
+  end
+end
+
+puts "executed in [#{Time.now - start_time}] seconds"

data/ffi-rzmq.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-rzmq}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-08-30}
   s.description = %q{This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
 function interface). It's a pure ruby wrapper so this gem can be loaded
 and run by any ruby runtime that supports FFI. Right now that means
-MRI 1.8.7, 1.9.1 and JRuby.
+MRI 1.9.x and JRuby.
 
 The impetus behind this library was to provide support for ZeroMQ in
 JRuby which has native threads. Unlike MRI, MacRuby, IronRuby and
@@ -20,7 +20,7 @@ other runtimes remove their GIL, JRuby will likely be the best
 environment to run this library.}
   s.email = %q{cremes@mac.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "version.txt"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "examples/local_lat.rb", "examples/local_lat_zerocopy.rb", "examples/publish_subscribe.rb", "examples/remote_lat.rb", "examples/remote_lat_zerocopy.rb", "examples/reqrep_poll.rb", "examples/request_response.rb", "ffi-rzmq.gemspec", "lib/ffi-rzmq.rb", "lib/ffi-rzmq/context.rb", "lib/ffi-rzmq/exceptions.rb", "lib/ffi-rzmq/message.rb", "lib/ffi-rzmq/poll.rb", "lib/ffi-rzmq/poll_items.rb", "lib/ffi-rzmq/socket.rb", "lib/ffi-rzmq/wrapper.rb", "lib/ffi-rzmq/zmq.rb", "spec/context_spec.rb", "spec/reqrep_spec.rb", "spec/socket_spec.rb", "spec/spec_helper.rb", "version.txt"]
+  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/async_req_rep.rb", "examples/local_lat.rb", "examples/local_lat_zerocopy.rb", "examples/publish_subscribe.rb", "examples/remote_lat.rb", "examples/remote_lat_zerocopy.rb", "examples/reqrep_poll.rb", "examples/request_response.rb", "examples/t", "examples/xreqxrep_poll.rb", "ffi-rzmq.gemspec", "lib/ffi-rzmq.rb", "lib/ffi-rzmq/context.rb", "lib/ffi-rzmq/exceptions.rb", "lib/ffi-rzmq/message.rb", "lib/ffi-rzmq/poll.rb", "lib/ffi-rzmq/poll_items.rb", "lib/ffi-rzmq/socket.rb", "lib/ffi-rzmq/wrapper.rb", "lib/ffi-rzmq/zmq.rb", "spec/context_spec.rb", "spec/reqrep_spec.rb", "spec/socket_spec.rb", "spec/spec_helper.rb", "version.txt"]
   s.homepage = %q{http://github.com/chuckremes/ffi-rzmq}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -33,11 +33,11 @@ environment to run this library.}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 3.4.3"])
+      s.add_development_dependency(%q<bones>, [">= 3.4.7"])
     else
-      s.add_dependency(%q<bones>, [">= 3.4.3"])
+      s.add_dependency(%q<bones>, [">= 3.4.7"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 3.4.3"])
+    s.add_dependency(%q<bones>, [">= 3.4.7"])
   end
 end

data/lib/ffi-rzmq.rb

@@ -63,7 +63,8 @@ end  # module ZMQ
 
 # some code is conditionalized based upon what ruby engine we are
 # executing
-RBX = RUBY_ENGINE =~ /rbx/ ? true : false
+
+RBX = defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/ ? true : false
 
 # the order of files is important
 %w(wrapper zmq exceptions context message socket poll_items poll).each do |file|

data/lib/ffi-rzmq/context.rb

@@ -65,8 +65,8 @@ module ZMQ
     #   #ZMQ::PUB
     #   #ZMQ::SUB
     #   #ZMQ::PAIR
-    #   #ZMQ::UPSTREAM
-    #   #ZMQ::DOWNSTREAM
+    #   #ZMQ::PULL
+    #   #ZMQ::PUSH
     #   #ZMQ::XREQ
     #   #ZMQ::XREP
     #

data/lib/ffi-rzmq/message.rb

@@ -95,7 +95,7 @@ module ZMQ
     # deallocation of the native memory buffer.
     #
     def copy_in_string string
-      copy_in_bytes string, string.size
+      copy_in_bytes string, string.size if string
     end
 
     # Makes a copy of +len+ bytes from the ruby string +bytes+. Library
@@ -104,7 +104,7 @@ module ZMQ
     def copy_in_bytes bytes, len
       # release any associated buffers if this Message object is being
       # reused
-      close unless uninitialized?
+      close unless uninitialized? # FIXME: this is a bug waiting to happen
 
       data_buffer = LibC.malloc len
       # writes the exact number of bytes, no null byte to terminate string

data/lib/ffi-rzmq/poll.rb

@@ -67,7 +67,6 @@ module ZMQ
       unless item
         @sockets << sock
         item = LibZMQ::PollItem.new
-        @raw_to_socket[item.socket] = sock
 
         case sock
         when ZMQ::Socket, Socket
@@ -77,11 +76,12 @@ module ZMQ
           item[:socket] = 0
           item[:fd] = fd
         end
-      end
 
+        @raw_to_socket[item[:socket].address] = sock
+        @items << item
+      end
+      
       item[:events] |= events
-
-      @items << item
     end
 
     # Deregister the +sock+ for +events+.
@@ -97,7 +97,7 @@ module ZMQ
         # change the value in place
         item[:events] ^= events
 
-        delete sock if items[:events].zero?
+        delete sock if item[:events].zero?
       end
     end
 
@@ -150,7 +150,7 @@ module ZMQ
       hsh = {}
 
       @items.each do |poll_item|
-        hsh[@raw_to_socket[poll_item.socket]] = poll_item
+        hsh[@raw_to_socket[poll_item[:socket].address]] = poll_item
       end
 
       hsh
@@ -161,8 +161,8 @@ module ZMQ
       @writables.clear
 
       @items.each do |poll_item|
-        @readables << @raw_to_socket[poll_item.socket] if poll_item.readable?
-        @writables << @raw_to_socket[poll_item.socket] if poll_item.writable?
+        @readables << @raw_to_socket[poll_item[:socket].address] if poll_item.readable?
+        @writables << @raw_to_socket[poll_item[:socket].address] if poll_item.writable?
       end
     end
 

data/lib/ffi-rzmq/socket.rb

@@ -19,7 +19,7 @@ module ZMQ
     # memory management.
     #
     # +type+ can be one of ZMQ::REQ, ZMQ::REP, ZMQ::PUB,
-    # ZMQ::SUB, ZMQ::PAIR, ZMQ::UPSTREAM, ZMQ::DOWNSTREAM,
+    # ZMQ::SUB, ZMQ::PAIR, ZMQ::PULL, ZMQ::PUSH,
     # ZMQ::XREQ or ZMQ::XREP.
     #
     # Can raise two kinds of exceptions depending on the error.
@@ -40,7 +40,7 @@ module ZMQ
         raise ContextError.new ZMQ_SOCKET_STR, 0, ETERM, "Context pointer was null"
       end
 
-      define_finalizer
+      #define_finalizer
     end
 
     # Set the queue options on this socket.
@@ -119,13 +119,13 @@ module ZMQ
         # will force a raise
         error_check ZMQ_SETSOCKOPT_STR, -1
       end
-      
+
       option_value, option_length = alloc_temp_sockopt_buffers option_name
 
       result_code = LibZMQ.zmq_getsockopt @socket, option_name, option_value, option_length
       error_check ZMQ_GETSOCKOPT_STR, result_code
       ret = 0
-      
+
       case option_name
       when RCVMORE, MCAST_LOOP
         # boolean return
@@ -135,11 +135,11 @@ module ZMQ
       when IDENTITY
         ret = option_value.read_string(option_length.read_long_long)
       end
-      
+
       ret
     end
   end
-  
+
   # Convenience method for checking on additional message parts.
   #
   # Equivalent to Socket#getsockopt ZMQ::RCVMORE
@@ -147,13 +147,13 @@ module ZMQ
   def more_parts?
     getsockopt ZMQ::RCVMORE
   end
-  
+
   # Convenience method for getting the value of the socket IDENTITY.
   #
   def identity
     getsockopt ZMQ::IDENTITY
   end
-  
+
   # Convenience method for setting the value of the socket IDENTITY.
   #
   def identity= value
@@ -312,7 +312,7 @@ module ZMQ
 
     flags != NOBLOCK ? error_check(ZMQ_RECV_STR, result_code) : error_check_nonblock(result_code)
   end
-  
+
   def alloc_temp_sockopt_buffers option_name
     length = FFI::MemoryPointer.new :int64
 

data/lib/ffi-rzmq/wrapper.rb

@@ -23,7 +23,8 @@ module LibZMQ
   LINUX = ["libzmq", "/usr/local/lib/libzmq", "/opt/local/lib/libzmq"]
   OSX = ["libzmq", "/usr/local/lib/libzmq", "/opt/local/lib/libzmq"]
   WINDOWS = []
-  RBX ? ffi_lib(*(LINUX + OSX + WINDOWS)) : ffi_lib(LINUX + OSX + WINDOWS)
+  ffi_lib(LINUX + OSX + WINDOWS)
+  
 
   # Misc
   attach_function :zmq_version, [:pointer, :pointer, :pointer], :void

data/lib/ffi-rzmq/zmq.rb

@@ -9,8 +9,8 @@ module ZMQ
   REP = 4
   XREQ = 5
   XREP = 6
-  UPSTREAM = 7
-  DOWNSTREAM = 8
+  PULL = UPSTREAM = 7
+  PUSH = DOWNSTREAM = 8
 
   #  Socket options
   HWM = 1

data/spec/context_spec.rb

@@ -1,3 +1,4 @@
+$: << "." # added for ruby 1.9.2 compatibilty; it doesn't include the current directory on the load path anymore
 
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 

data/spec/socket_spec.rb

@@ -42,12 +42,12 @@ module ZMQ
         lambda { Socket.new(ctx.pointer, ZMQ::XREP) }.should_not raise_error
       end
 
-      it "should not raise an error for a ZMQ::DOWNSTREAM socket type" do
-        lambda { Socket.new(ctx.pointer, ZMQ::DOWNSTREAM) }.should_not raise_error
+      it "should not raise an error for a ZMQ::PUSH socket type" do
+        lambda { Socket.new(ctx.pointer, ZMQ::PUSH) }.should_not raise_error
       end
 
-      it "should not raise an error for a ZMQ::UPSTREAM socket type" do
-        lambda { Socket.new(ctx.pointer, ZMQ::UPSTREAM) }.should_not raise_error
+      it "should not raise an error for a ZMQ::PULL socket type" do
+        lambda { Socket.new(ctx.pointer, ZMQ::PULL) }.should_not raise_error
       end
 
       it "should raise an error for an unknown socket type" do
@@ -60,6 +60,7 @@ module ZMQ
       end
 
       it "should define a finalizer on this object" do
+        pending # need to wait for 0mq 2.1 or later to fix this
         ObjectSpace.should_receive(:define_finalizer)
         ctx = Context.new 1
       end

data/version.txt

@@ -1 +1 @@
-0.5.0
+0.5.1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 5
-    - 0
-  version: 0.5.0
+    - 1
+  version: 0.5.1
 platform: ruby
 authors: 
   - Chuck Remes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -05:00
+date: 2010-08-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -27,15 +27,15 @@ dependencies:
             segments: 
               - 3
               - 4
-              - 3
-            version: 3.4.3
+              - 7
+            version: 3.4.7
     type: :development
     version_requirements: *id001
 description: |-
   This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
   function interface). It's a pure ruby wrapper so this gem can be loaded
   and run by any ruby runtime that supports FFI. Right now that means
-  MRI 1.8.7, 1.9.1 and JRuby.
+  MRI 1.9.x and JRuby.
   
   The impetus behind this library was to provide support for ZeroMQ in
   JRuby which has native threads. Unlike MRI, MacRuby, IronRuby and
@@ -53,9 +53,11 @@ extra_rdoc_files:
   - README.rdoc
   - version.txt
 files: 
+  - .bnsignore
   - History.txt
   - README.rdoc
   - Rakefile
+  - examples/async_req_rep.rb
   - examples/local_lat.rb
   - examples/local_lat_zerocopy.rb
   - examples/publish_subscribe.rb
@@ -63,6 +65,8 @@ files:
   - examples/remote_lat_zerocopy.rb
   - examples/reqrep_poll.rb
   - examples/request_response.rb
+  - examples/t
+  - examples/xreqxrep_poll.rb
   - ffi-rzmq.gemspec
   - lib/ffi-rzmq.rb
   - lib/ffi-rzmq/context.rb