ffi-rzmq 0.8.2 → 0.9.0

data/spec/spec_helper.rb

@@ -7,11 +7,24 @@ File.join(File.dirname(__FILE__), %w[.. lib ffi-rzmq]))
 
 Thread.abort_on_exception = true
 
-SPEC_CTX = ZMQ::Context.new 1
-def spec_ctx
-  SPEC_CTX
+# define some version guards so we can turn on/off specs based upon
+# the version of the 0mq library that is loaded
+def version2?
+  LibZMQ.version2?
 end
 
+def version3?
+  LibZMQ.version3?
+end
+
+def version4?
+  LibZMQ.version4?
+end
+
+
+NonBlockingFlag = (LibZMQ.version2? ? ZMQ::NOBLOCK : ZMQ::DONTWAIT) unless defined?(NonBlockingFlag)
+
+
 module APIHelper
   def stub_libzmq
     @err_str_mock = mock("error string")
@@ -27,4 +40,34 @@ module APIHelper
   def random_port
     rand(55534) + 10_000
   end
+
+  def bind_to_random_tcp_port socket, max_tries = 500
+    tries = 0
+    rc = -1
+
+    while !ZMQ::Util.resultcode_ok?(rc) && tries < max_tries
+      tries += 1
+      random = random_port
+      rc = socket.bind "tcp://127.0.0.1:#{random}"
+    end
+
+    random
+  end
+
+  def connect_to_random_tcp_port socket, max_tries = 500
+    tries = 0
+    rc = -1
+
+    while !ZMQ::Util.resultcode_ok?(rc) && tries < max_tries
+      tries += 1
+      random = random_port
+      rc = socket.connect "tcp://127.0.0.1:#{random}"
+    end
+
+    random
+  end
+
+  def assert_ok(rc)
+    raise "Failed with rc [#{rc}] and errno [#{ZMQ::Util.errno}], msg [#{ZMQ::Util.error_string}]! #{caller(0)}" unless rc >= 0
+  end
 end

data/version.txt

@@ -1 +1 @@
-0.8.2
+0.9.0

metadata

@@ -1,29 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.2
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
-  - Chuck Remes
+- Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -06:00
+date: 2011-09-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: bones
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.5.4
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 5
+        - 4
+        version: 3.5.4
+  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
@@ -35,75 +43,92 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - AUTHORS.txt
-  - History.txt
-  - README.rdoc
-  - examples/README.rdoc
-  - version.txt
+- AUTHORS.txt
+- History.txt
+- README.rdoc
+- examples/README.rdoc
+- version.txt
 files: 
-  - .bnsignore
-  - History.txt
-  - README.rdoc
-  - Rakefile
-  - examples/README.rdoc
-  - examples/local_lat.rb
-  - examples/local_lat_poll.rb
-  - examples/local_lat_zerocopy.rb
-  - examples/local_throughput.rb
-  - examples/publish_subscribe.rb
-  - examples/remote_lat.rb
-  - examples/remote_lat_zerocopy.rb
-  - examples/remote_throughput.rb
-  - examples/reqrep_poll.rb
-  - examples/request_response.rb
-  - ffi-rzmq.gemspec
-  - lib/ffi-rzmq.rb
-  - lib/ffi-rzmq/context.rb
-  - lib/ffi-rzmq/device.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/device_spec.rb
-  - spec/message_spec.rb
-  - spec/pushpull_spec.rb
-  - spec/reqrep_spec.rb
-  - spec/socket_spec.rb
-  - spec/spec_helper.rb
-  - version.txt
-  - AUTHORS.txt
+- .bnsignore
+- History.txt
+- README.rdoc
+- Rakefile
+- examples/README.rdoc
+- examples/v2api/local_lat.rb
+- examples/v2api/local_lat_poll.rb
+- examples/v2api/local_throughput.rb
+- examples/v2api/publish_subscribe.rb
+- examples/v2api/remote_lat.rb
+- examples/v2api/remote_throughput.rb
+- examples/v2api/reqrep_poll.rb
+- examples/v2api/request_response.rb
+- examples/v2api/throughput_measurement.rb
+- examples/v3api/local_lat.rb
+- examples/v3api/local_lat_poll.rb
+- examples/v3api/local_throughput.rb
+- examples/v3api/publish_subscribe.rb
+- examples/v3api/remote_lat.rb
+- examples/v3api/remote_throughput.rb
+- examples/v3api/reqrep_poll.rb
+- examples/v3api/request_response.rb
+- examples/v3api/throughput_measurement.rb
+- ext/README
+- ffi-rzmq.gemspec
+- lib/ffi-rzmq.rb
+- lib/ffi-rzmq/constants.rb
+- lib/ffi-rzmq/context.rb
+- lib/ffi-rzmq/device.rb
+- lib/ffi-rzmq/exceptions.rb
+- lib/ffi-rzmq/libc.rb
+- lib/ffi-rzmq/libzmq.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/util.rb
+- spec/context_spec.rb
+- spec/device_spec.rb
+- spec/message_spec.rb
+- spec/multipart_spec.rb
+- spec/nonblocking_recv_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb
+- version.txt
+- AUTHORS.txt
 has_rdoc: true
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.rdoc
+- --main
+- README.rdoc
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign function interface).
+summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).
 test_files: []
 

data/examples/local_lat_poll.rb

@@ -1,54 +0,0 @@
-require 'rubygems'
-require 'ffi-rzmq'
-
-if ARGV.length < 3
-  puts "usage: local_lat <connect-to> <message-size> <roundtrip-count>"
-  exit
-end
-
-link = ARGV[0]
-message_size = ARGV[1].to_i
-roundtrip_count = ARGV[2].to_i
-
-#link = "tcp://127.0.0.1:5555"
-
-ctx = ZMQ::Context.new
-s1 = ctx.socket ZMQ::REQ
-s2 = ctx.socket ZMQ::REP
-
-s1.connect link
-s2.bind link
-
-poller = ZMQ::Poller.new
-poller.register_readable s2
-poller.register_readable s1
-
-
-start_time = Time.now
-
-# kick it off
-message = ZMQ::Message.new("a" * message_size)
-s1.send message, ZMQ::NOBLOCK
-i = roundtrip_count
-
-until i.zero?
-  i -= 1
-  
-  begin
-    poller.poll_nonblock
-  rescue ZMQ::PollError => e
-    puts "efault? [#{e.efault?}]"
-    raise
-  end
-
-  poller.readables.each do |socket|
-    received_message = socket.recv_string ZMQ::NOBLOCK
-    socket.send ZMQ::Message.new(received_message), ZMQ::NOBLOCK
-  end  
-end
-
-elapsed_usecs = (Time.now.to_f - start_time.to_f) * 1_000_000
-latency = elapsed_usecs / roundtrip_count / 2
-
-puts "mean latency: %.3f [us]" % latency
-puts "received all messages in %.3f seconds" % (elapsed_usecs / 1_000_000)

data/examples/local_lat_zerocopy.rb

@@ -1,24 +0,0 @@
-require 'rubygems'
-require 'ffi-rzmq'
-
-if ARGV.length < 3
-  puts "usage: local_lat <connect-to> <message-size> <roundtrip-count>"
-  exit
-end
-
-bind_to = ARGV[0]
-message_size = ARGV[1].to_i
-roundtrip_count = ARGV[2].to_i
-
-ctx = ZMQ::Context.new 1
-s = ZMQ::Socket.new ctx.context, ZMQ::REP
-s.setsockopt ZMQ::HWM, 100
-s.bind bind_to
-
-msg = ZMQ::Message.new
-
-roundtrip_count.times do
-  result = s.recv msg, 0
-  raise "Message size doesn't match, expected [#{message_size}] but received [#{msg.size}]" if message_size != msg.size
-  s.send msg, 0
-end

data/examples/publish_subscribe.rb

@@ -1,52 +0,0 @@
-require 'rubygems'
-require 'ffi-rzmq'
-
-
-link = "tcp://127.0.0.1:5555"
-
-ctx = ZMQ::Context.new 1
-s1 = ctx.socket ZMQ::PUB
-s2 = ctx.socket ZMQ::SUB
-s3 = ctx.socket ZMQ::SUB
-s4 = ctx.socket ZMQ::SUB
-s5 = ctx.socket ZMQ::SUB
-
-s2.setsockopt ZMQ::SUBSCRIBE, '' # receive all
-s3.setsockopt ZMQ::SUBSCRIBE, 'animals' # receive any starting with this string
-s4.setsockopt ZMQ::SUBSCRIBE, 'animals.dog'
-s5.setsockopt ZMQ::SUBSCRIBE, 'animals.cat'
-
-s1.bind link
-s2.connect link
-s3.connect link
-s4.connect link
-s5.connect link
-
-sleep 1
-
-topic = "animals.dog"
-payload = "Animal crackers!"
-
-s1.identity = "publisher-A"
-puts "sending"
-# use the new multi-part messaging support to
-# automatically separate the topic from the body
-s1.send_string topic, ZMQ::SNDMORE
-s1.send_string payload, ZMQ::SNDMORE
-s1.send_string s1.identity
-
-topic = s2.recv_string
-body = s2.recv_string if s2.more_parts?
-identity = s2.recv_string if s2.more_parts?
-puts "s2 received topic [#{topic}], body [#{body}], identity [#{identity}]"
-
-topic = s3.recv_string
-body = s3.recv_string if s3.more_parts?
-puts "s3 received topic [#{topic}], body [#{body}]"
-
-topic = s4.recv_string
-body = s4.recv_string if s4.more_parts?
-puts "s4 received topic [#{topic}], body [#{body}]"
-
-s5_string = s5.recv_string ZMQ::NOBLOCK
-puts(s5_string.nil? ? "s5 received no messages" : "s5 FAILED")

data/examples/remote_lat_zerocopy.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'ffi-rzmq'
-
-if ARGV.length < 3
-  puts "usage: remote_lat <connect-to> <message-size> <roundtrip-count>"
-  exit
-end
-
-connect_to = ARGV[0]
-message_size = ARGV[1].to_i
-roundtrip_count = ARGV[2].to_i
-
-ctx = ZMQ::Context.new 1
-s = ctx.socket ZMQ::REQ
-s.connect connect_to
-
-msg = ZMQ::Message.new "#{'3'*message_size}"
-
-start_time = Time.now
-
-roundtrip_count.times do
-  s.send msg, 0
-  result = s.recv msg, 0
-  raise "Message size doesn't match, expected [#{message_size}] but received [#{msg.size}]" if message_size != msg.size
-end
-
-end_time = Time.now
-elapsed_secs = (end_time.to_f - start_time.to_f)
-elapsed_usecs = elapsed_secs * 1000000
-latency = elapsed_usecs / roundtrip_count / 2
-
-puts "message size: %i [B]" % message_size
-puts "roundtrip count: %i" % roundtrip_count
-puts "throughput (msgs/s): %i" % (roundtrip_count / elapsed_secs)
-puts "mean latency: %.3f [us]" % latency

data/examples/remote_throughput.rb

@@ -1,27 +0,0 @@
-require 'rubygems'
-require 'ffi-rzmq'
-
-if ARGV.length != 3
-	puts "usage: remote_thr <connect-to> <message-size> <message-count>"
-	Process.exit
-end
-    
-connect_to = ARGV[0]
-message_size = ARGV[1].to_i
-message_count = ARGV[2].to_i
-
-ctx = ZMQ::Context.new
-s = ZMQ::Socket.new ctx.pointer, ZMQ::PUB
-
-s.connect connect_to
-
-contents = "#{'0'*message_size}"
-
-i = 0
-while i < message_count
-  msg = ZMQ::Message.new contents
-	s.send msg
-	i += 1
-end
-
-sleep 10