pigato 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf42b9ee09f4f2d044a205392c259d2532ca814a
-  data.tar.gz: bca843c87ada09476d84d73302511193e192b378
+  metadata.gz: 46d068f4ccf95334efcf4129d0828b8bb71f6749
+  data.tar.gz: 38b9dc5f5d144ba525f739fdbbca1d36906e3b58
 SHA512:
-  metadata.gz: ec4378e46841c525850f428c01000b2f3f02a50e1a2587edec105cf2ee3c9376b37d0aa8a9d9a7c00a4fdeadced8fe71984d46e169ac05e0c5547623d33cb44b
-  data.tar.gz: d680305a50369e71b72db8714d1dd23d3528789ca107e61a5d55a7b22473b6f30506c0f336e90ca707aa358bcee3d0390698b29c45491f4ae324a340a7de0ad0
+  metadata.gz: ae471cfaae108c0120960bed457e4bac642d234fc48e3b0bd51b76c03794b4a5c8a0ec2716622c7f7d1e8040c616c8ccdd10cd09118bde0b3ad7b9b3851da474
+  data.tar.gz: 0d9c411dd3bf8623a6a1d726b43dc50b4b8f7bcc296530379e99c01d89e2ce20d442fee90be2be84a45b526a6e1fcf5f7e2e135a956d28b2764561844ec0ad8f

data/examples/echo_client.rb

@@ -5,7 +5,7 @@ require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
 
 client = Pigato::Client.new('tcp://localhost:55555', { :autostart => true })
-requests = 1000
+requests = 10
 d1 = Time.now
 requests.times do |i|
   begin

data/lib/pigato/client.rb

@@ -1,13 +1,9 @@
-require "oj"
-require "securerandom"
-
 class Pigato::Client
 
   def initialize broker, conf = {}
     @broker = broker
     @context = ZMQ::Context.new(1)
     @socket = nil
-    @poller = ZMQ::Poller.new
 
     @conf = {
       :autostart => false,
@@ -28,7 +24,9 @@ class Pigato::Client
 
     rid = SecureRandom.uuid
     request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
-    @socket.send_strings request
+    msg = ZMQ::Message.new
+    request.reverse.each{|p| msg.push(ZMQ::Frame(p))}
+    @socket.send_message msg
 
     res = [] 
     while 1 do
@@ -43,27 +41,20 @@ class Pigato::Client
   end
 
   def _recv rid, timeout = @timeout
-    items = @poller.poll(timeout)
-    if items 
-      msg = []
-      d1 = Time.now
-      while 1 do
-        @socket.recv_strings(msg, ZMQ::DONTWAIT)
-        msg = [] if msg.length < 5 || msg[3] != rid
-        break if msg.length > 0 || ((Time.now - d1) * 1000 > timeout)
-        sleep(1.0 / 50.0)
-      end
-
-      return nil if msg.length == 0
+    @socket.rcvtimeo = timeout;
+    data = []
+    d1 = Time.now
+    msg = @socket.recv_message()
+    while 1 do
+      break if !msg || msg.size == 0
+      data << msg.pop.data
+    end
+    data = [] if data[3] != rid
 
-      # header
-      if msg.shift != Pigato::C_CLIENT
-        raise RuntimeError, "Not a valid Pigato message"
-      end
+    return nil if data.length == 0
 
-      return msg 
-    end
-    nil
+    data.shift
+    return data 
   end
   
   def start
@@ -76,13 +67,12 @@ class Pigato::Client
 
   def reconnect_to_broker
     if @socket
-      @poller.deregister @socket, ZMQ::DEALER
+      @socket.close
     end
 
     @socket = @context.socket ZMQ::DEALER
-    @socket.setsockopt ZMQ::LINGER, 0
-    @socket.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
+    @context.linger = 0
+    @socket.identity = SecureRandom.uuid
     @socket.connect @broker
-    @poller.register @socket, ZMQ::POLLIN
   end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/pigato/worker.rb

@@ -1,7 +1,3 @@
-require "oj"
-require "ffi-rzmq"
-require "securerandom"
-
 class Pigato::Worker
 
   HEARTBEAT_LIVENESS = 3 # 3-5 is reasonable
@@ -10,7 +6,6 @@ class Pigato::Worker
     @broker = broker
     @service = service
     @context = ZMQ::Context.new(1)
-    @poller = ZMQ::Poller.new
     @socket = nil # Socket to broker
     @heartbeat_at = 0 # When to send HEARTBEAT (relative to time.time(), so in seconds)
     @liveness = 0 # How many attempts left
@@ -27,7 +22,7 @@ class Pigato::Worker
   
   def reply reply
     reply = [@reply_to, '', @reply_rid, '0'].concat([Oj.dump(reply)])
-    send_to_broker Pigato::W_REPLY, reply, nil
+    send_to_broker Pigato::W_REPLY, reply
   end
 
   def recv reply
@@ -36,30 +31,28 @@ class Pigato::Worker
       @reply_to = nil
       @reply_service = nil
 
-      items = @poller.poll(@timeout) 
-      if items
-        msg = []
-        @socket.recv_strings msg
+      msg = @socket.recv_message 
 
+      if msg && msg.size 
         @liveness = HEARTBEAT_LIVENESS
 
-        header = msg.shift
+        header = msg.pop.data
         if header != Pigato::W_WORKER
           puts "E: Header is not Pigato::WORKER"
           next
         end
 
-        command = msg.shift
+        command = msg.pop.data
 
         case command
         when Pigato::W_REQUEST
           # We should pop and save as many addresses as there are
           # up to a null part, but for now, just save one...
-          @reply_to = msg.shift
-          @reply_service = msg.shift
-          msg.shift # empty
-          @reply_rid = msg.shift
-          val = Oj.load(msg[0]) # We have a request to process
+          @reply_to = msg.pop.data
+          @reply_service = msg.pop.data
+          msg.pop # empty
+          @reply_rid = msg.pop.data
+          val = Oj.load(msg.pop.data) # We have a request to process
           return val 
         when Pigato::W_HEARTBEAT
           # do nothing
@@ -85,30 +78,29 @@ class Pigato::Worker
 
   def reconnect_to_broker
     if @socket
-      @poller.deregister @socket, ZMQ::DEALER
       @socket.close
     end
 
     @socket = @context.socket ZMQ::DEALER
-    @socket.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
-    @socket.setsockopt ZMQ::LINGER, 0 
+    @context.linger = 0
+    @socket.identity = SecureRandom.uuid
     @socket.connect @broker
-    @poller.register @socket, ZMQ::POLLIN
-    send_to_broker(Pigato::W_READY, @service, [])
+    @socket.rcvtimeo = @timeout;
+    send_to_broker Pigato::W_READY, @service
     @liveness = HEARTBEAT_LIVENESS
     @heartbeat_at = Time.now + 0.001 * @heartbeat
   end
 
-  def send_to_broker command, message=nil, options=nil
-    if message.nil?
-      message = []
-    elsif not message.is_a?(Array)
-      message = [message]
+  def send_to_broker command, data = nil
+    if data.nil?
+      data = []
+    elsif not data.is_a?(Array)
+      data = [data]
     end
 
-    message = [Pigato::W_WORKER, command].concat message
-    message = message.concat(options) if options
-    
-    @socket.send_strings message
+    data = [Pigato::W_WORKER, command].concat data
+    msg = ZMQ::Message.new
+    data.reverse.each{|p| msg.push(ZMQ::Frame(p))}
+    @socket.send_message msg
   end
 end

data/lib/pigato.rb

@@ -1,4 +1,7 @@
-require_relative "pigato/version.rb"
-require_relative "pigato/proto.rb"
-require_relative "pigato/client.rb"
-require_relative "pigato/worker.rb"
+require 'zmq'
+require 'oj'
+require 'securerandom'
+require_relative 'pigato/version.rb'
+require_relative 'pigato/proto.rb'
+require_relative 'pigato/client.rb'
+require_relative 'pigato/worker.rb'

data/pigato.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "ffi-rzmq", "~> 2.0"
+  spec.add_runtime_dependency "rbczmq", "~> 1.7.8"
   spec.add_runtime_dependency "oj", "~> 2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Paolo Ardoino
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: ffi-rzmq
+  name: rbczmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement