pigato 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86be31e60a1468d9ec1e122711187f1d5444ccd
-  data.tar.gz: 98770e64b922bb6545d263d9e9dfec643fd6c642
+  metadata.gz: d98e3d33779bd55e21b6dd1ad0311e059ea142bf
+  data.tar.gz: f520a52c6ae420c5d59dbd60ff0761174bf56d5f
 SHA512:
-  metadata.gz: 650b7d9c9676aa6965a7f399e4a16e6730a3028eff886697a07b0f35d3c6e64487a7d1f25ad235e29b67b7e5cc6cbd67a320f4eac8f3480f8071944827f00732
-  data.tar.gz: 510d38ededa32c5aaa5302f41e0c62087c09cf02da93f170aca689217010a60a504b2c1ca9188fbd879d8202ee8ba5163a4de018cbc8c5724b187c92e8ee0396
+  metadata.gz: 31a112e4750fffd77b813e4787f01d0b4c4cc2ac8495cab8d9b944aa31323c7fc44daf2493178ded13d7348117a0c5b06cb519474d4f99fb7d506c244a483256
+  data.tar.gz: 90b78f68f1335be0a1356254f9b5c4abf29735923989ed4b71587b444290ee47e317a0a4c4cbccc379ae2d283c7dbd9ba9470c00a007fa7af997f2bb096557d2

data/examples/echo_client.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'pry-remote'
 
 require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
@@ -7,34 +8,17 @@ require 'thread'
 
 client = Pigato::Client.new('tcp://localhost:55555')
 
-c1 = Thread.new {
-  client.stop
-  client.start
-  requests = 1000
-  d1 = Time.now
-  requests.times do |i|
-    begin
-      client.request('echo', 'Hello world')
-    end
-  end
-  d2 = Time.now
-  puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
-}
-
-c2 = Thread.new {
-  client.stop
-  client.start
-  requests = 1000
-  d1 = Time.now
-  requests.times do |i|
-    begin
-      client.request('echo', 'Hello world')
-    end
-  end
-  d2 = Time.now
-  puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
-}
+#Process.daemon
 
+#binding.remote_pry
 
-c1.join
-c2.join
+client.start
+requests = 1000
+d1 = Time.now
+requests.times do |i|
+  begin
+    client.request('echo', 'Hello world1')
+  end
+end
+d2 = Time.now
+puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"

data/lib/pigato/client.rb

@@ -3,12 +3,8 @@ require 'thread'
 class Pigato::Client
 
   def initialize broker, conf = {}
-    @mtx = Mutex.new
     @broker = broker
-    @ctx = ZMQ::Context.new
-    @ctx.linger = 0
-
-    @sockets = {}
+    @ctxs = {}
 
     @conf = {
       :autostart => false,
@@ -28,9 +24,10 @@ class Pigato::Client
   end
  
   def request service, request, opts = {}
-    socket = @sockets[getid()]
-    return nil if socket == nil;
-
+    return nil if @ctxs[getid()] == nil 
+    
+    socket = @ctxs[getid()]['socket']
+    
     request = [Oj.dump(request), Oj.dump(opts)]
 
     rid = SecureRandom.uuid
@@ -53,7 +50,7 @@ class Pigato::Client
   end
 
   def _recv rid 
-    socket = @sockets[getid()]
+    socket = @ctxs[getid()]['socket']
     socket.rcvtimeo = @conf[:timeout]
     data = []
     d1 = Time.now
@@ -76,18 +73,20 @@ class Pigato::Client
 
   def stop
     tid = getid()
-    socket = @sockets[tid]
-    if socket
-      socket.close
-      @sockets.delete(tid)
+    if @ctxs[tid]
+      @ctxs[tid]['socket'].close
+      @ctxs[tid]['ctx'].destroy
+      @ctxs.delete(tid)
     end
   end
 
   def reconnect_to_broker
     stop
-    socket = @ctx.socket ZMQ::DEALER
+    ctx = ZMQ::Context.new
+    ctx.linger = 0
+    socket = ctx.socket ZMQ::DEALER
     socket.identity = SecureRandom.uuid
     socket.connect @broker
-    @sockets[getid()] = socket
+    @ctxs[getid()] = { 'socket' => socket, 'ctx' => ctx }
   end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

metadata

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