pigato 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb10f9ed50f4425576fcb1dd7e32d0b2f2c7e45
-  data.tar.gz: 61516e01acb8e78ab4d1fe79f4450b1b71ba942a
+  metadata.gz: 0b57e3dd6034adbb1b671c2c4a6bfd625efd1f35
+  data.tar.gz: d6278ff630b96fffed753a6dd99c26bfbc6039cf
 SHA512:
-  metadata.gz: f6356f628e5796a3ace76b2ed7242376c4e70f1ff8525550ab3a43c37b3c4360908de9cf1b7476d0f495d7aab21374baddb90f6309cb70a054fa1bad1e976b40
-  data.tar.gz: b7a20ce03675ad6c77b6a2794499c2b79d78be38d27a421021b79bb9e4471b8ed94a09033fc29405f50b41e237f01568665f3f6d8996fb98cb229fa24cbfd8b1
+  metadata.gz: 75f1d936dad3343e9409b7bf9e7e8f369d43c05bfa9fa81d4691985e44bb91823ba4df8892284cf14437d4f122b2c1633f79d1ae1187928aa28abb6e8c00a6ad
+  data.tar.gz: ac952910fc9ca3d96b7ac4e348f3bab3c9fa770ae140b1ab6a541ac2d47d620f1ab9f0a677f4a63847e45825ea5811f7ed7eb0a38991aff83f72cca08b11a2ce

data/examples/echo_client.rb

@@ -3,14 +3,19 @@
 require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
+require 'thread'
 
 client = Pigato::Client.new('tcp://localhost:55555', { :autostart => true })
-requests = 1000
-d1 = Time.now
-requests.times do |i|
-  begin
-    client.request('echo', 'Hello world', { "nocache" => 1 })
+c1 = Thread.new {
+  requests = 1000
+  d1 = Time.now
+  requests.times do |i|
+    begin
+      client.request('echo', 'Hello world')
+    end
   end
-end
-d2 = Time.now
-puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
+  d2 = Time.now
+  puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
+}
+
+c1.join

data/lib/pigato/client.rb

@@ -1,8 +1,14 @@
+require 'thread'
+
 class Pigato::Client
 
   def initialize broker, conf = {}
+    @mtx = Mutex.new
     @broker = broker
-    @socket = nil
+    @ctx = ZMQ::Context.new
+    @ctx.linger = 0
+
+    @sockets = {}
 
     @conf = {
       :autostart => false,
@@ -16,8 +22,12 @@ class Pigato::Client
     end
   end
 
-  def request service, request, opts = {} 
-    return nil if @socket == nil;
+ 
+  def request service, request, opts = {}
+    start if @sockets[Thread.current.object_id] == nil
+    socket = @sockets[Thread.current.object_id]
+     
+    return nil if socket == nil;
 
     request = [Oj.dump(request), Oj.dump(opts)]
 
@@ -25,7 +35,7 @@ class Pigato::Client
     request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
     msg = ZMQ::Message.new
     request.reverse.each{|p| msg.push(ZMQ::Frame(p))}
-    @socket.send_message msg
+    socket.send_message msg
 
     res = [] 
     while 1 do
@@ -41,10 +51,11 @@ class Pigato::Client
   end
 
   def _recv rid 
-    @socket.rcvtimeo = @conf[:timeout]
+    socket = @sockets[Thread.current.object_id]
+    socket.rcvtimeo = @conf[:timeout]
     data = []
     d1 = Time.now
-    msg = @socket.recv_message()
+    msg = socket.recv_message()
     while 1 do
       break if !msg || msg.size == 0
       data << msg.pop.data
@@ -62,20 +73,18 @@ class Pigato::Client
   end
 
   def stop
-    if @socket
-      @socket.close
-    end
-    if @ctx
-      @ctx.destroy
+    socket = @sockets[Thread.current.object_id]
+    if socket
+      socket.close
+      @sockets.delete(Thread.current.object_id)
     end
   end
 
   def reconnect_to_broker
     stop
-    @ctx = ZMQ::Context.new
-    @socket = @ctx.socket ZMQ::DEALER
-    @ctx.linger = 0
-    @socket.identity = SecureRandom.uuid
-    @socket.connect @broker
+    socket = @ctx.socket ZMQ::DEALER
+    socket.identity = SecureRandom.uuid
+    socket.connect @broker
+    @sockets[Thread.current.object_id] = socket
   end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/lib/pigato/worker.rb

@@ -5,7 +5,6 @@ class Pigato::Worker
   def initialize broker, service
     @broker = broker
     @service = service
-    @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
     @timeout = 2500

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Paolo Ardoino