pigato 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006a5eeffba25d949d31e70896e14f45948c3398
-  data.tar.gz: 17181c572ada29a77a007636415bb20a87e785f4
+  metadata.gz: 767b55541e28f390d0a978bc478cb209d8022e48
+  data.tar.gz: 7ad212b6cd040e718a74cff8f54e1383c01a7cc9
 SHA512:
-  metadata.gz: 2df204b3748cf487b2fe3c177f2cd65ec9d52fd8bb721b493cb61d11b69838c53c1f4dced7eff1ccfe9dbbbc747648c495b4026fad135381696742a150e74529
-  data.tar.gz: 4426e095848a3907a79f6a6e06ed2b0f3f594df6bfb46a3b66e11b86d7d2b669dd765e9a8414486d39a2a92d9627981ef6a7b8e69060fa474c2df4a240a82270
+  metadata.gz: 5679ae6ea22bd9a45275f8de037bf2c8abbda0a3a1cb5b914a72a4417005f083902ed3deb1fc175c7e525f1c9662b373e55e4d56a68c5a9bd06b6e9d1ac1ce10
+  data.tar.gz: 4fa094d344f1e726b47610e003c16d10747626c7e54ef99b76aada96193d4d1ce2c103b0ed0d157c60b7038bb6025ce5164d6bb5c3bc041165655264ea0612f4

data/examples/echo_client.rb

@@ -4,11 +4,12 @@ require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 
 client = PigatoClient.new('tcp://localhost:55555')
-requests = 10
+requests = 1000
+d1 = Time.now
 requests.times do |i|
   begin
-    puts client.send('echo', 'Hello world')
+    client.send('echo', 'Hello world')
   end
 end
-
-puts "#{requests} requests/replies processed"
+d2 = Time.now
+puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"

data/lib/pigato/client.rb

@@ -1,5 +1,4 @@
-require "json"
-require "ffi-rzmq"
+require "oj"
 require "securerandom"
 
 class PigatoClient
@@ -9,45 +8,49 @@ class PigatoClient
     @context = ZMQ::Context.new(1)
     @client = nil
     @poller = ZMQ::Poller.new
+    @timeout = 2500
 
     reconnect_to_broker
   end
 
-  def send service, request, timeout = 2500
-    request = [request.to_json]
+  def send service, request, timeout = @timeout
+    request = [Oj.dump(request)]
 
     rid = SecureRandom.uuid
     request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
     @client.send_strings request
 
-    res = Array.new
-    res << rid
-
-    data = Array.new
+    res = [] 
     while 1 do
-      chunk = _recv(timeout)
-      data << chunk[4]
+      chunk = _recv(rid, timeout)
+      break if chunk == nil
+      res << Oj.load(chunk[4])
       break if chunk[0] == Pigato::W_REPLY
     end
 
-    res << data
     res
   end
 
-  def _recv timeout
+  def _recv rid, timeout = @timeout
     items = @poller.poll(timeout)
-    if items
-      messages = []
-      @client.recv_strings messages
+    if items 
+      msg = []
+      d1 = Time.now
+      while 1 do
+        @client.recv_strings(msg, ZMQ::DONTWAIT)
+        msg = [] if msg.length < 5 || msg[3] != rid
+        break if msg.length > 0 || ((Time.now - d1) * 1000 > timeout)
+      end
+
+      return nil if msg.length == 0
 
       # header
-      if messages.shift != Pigato::C_CLIENT
+      if msg.shift != Pigato::C_CLIENT
         raise RuntimeError, "Not a valid Pigato message"
       end
 
-      return messages
+      return msg 
     end
-
     nil
   end
 

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/pigato/worker.rb

@@ -1,4 +1,4 @@
-require "json"
+require "oj"
 require "ffi-rzmq"
 require "securerandom"
 
@@ -25,7 +25,7 @@ class PigatoWorker
   end
   
   def reply reply
-    reply = [@reply_to, '', @reply_rid, '0'].concat([reply.to_json])
+    reply = [@reply_to, '', @reply_rid, '0'].concat([Oj.dump(reply)])
     send_to_broker Pigato::W_REPLY, reply, nil
   end
 
@@ -37,28 +37,29 @@ class PigatoWorker
 
       items = @poller.poll(@timeout) 
       if items
-        messages = []
-        @worker.recv_strings messages
+        msg = []
+        @worker.recv_strings msg
 
         @liveness = HEARTBEAT_LIVENESS
 
-        header = messages.shift
+        header = msg.shift
         if header != Pigato::W_WORKER
           puts "E: Header is not Pigato::WORKER"
+          next
         end
 
-        command = messages.shift
+        command = msg.shift
 
         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...
-          puts "REQUEST"
-          @reply_to = messages.shift
-          @reply_service = messages.shift
-          messages.shift # empty
-          @reply_rid = messages.shift
-          return messages[0] # We have a request to process
+          @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
+          return val 
         when Pigato::W_HEARTBEAT
           # do nothing
         when Pigato::W_DISCONNECT

data/pigato.gemspec

@@ -22,4 +22,5 @@ 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 "oj", "~> 2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Paolo Ardoino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: PIGATO-RUBY
 email:
 - paolo.ardoino@gmail.com