pigato 0.2.27 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4447f773500f2557cdd2ae53ed0e83985602108b
-  data.tar.gz: c7351e169c89359e324f3e3e088861a04addcdaa
+  metadata.gz: a968103e83dfa7c74641b521b44ef40631de9a10
+  data.tar.gz: 2704c9177783f08d2c2d31bbc9ce42cd58c8f581
 SHA512:
-  metadata.gz: 74ed8e928abb8a2add104bb3a3a89407dbeada35d04b20f287f48c17f6325e908387102bf35e51832b304247c0607b8c8fc09a28f3e13256ccf8949ed733d30d
-  data.tar.gz: b6b9948d4cb9e936b68638509e2e20f9dd7a40d0b29f73c0224891f18077d577a2f1d55df1ed3b4c5655c12ba31b5939409af4a4326304d1241ba03672f2faed
+  metadata.gz: cb2ca87e271ded59c9674624edfe6bde43535fb05884327fe69d5e543ae4d046e584e03933ffb869050306b8fe02757a4d6077acc560a8b8728ebf8309c3371f
+  data.tar.gz: f860dee15833e70138bb240766348b0a1cec1ca941d3ea0b71ff99e0be8a079c798cb18e4084cad38ea3d23201ed3ea8490c8efb3ad697a6e6b640d65da37872

data/examples/echo_client.rb

@@ -1,23 +1,29 @@
 #!/usr/bin/env ruby
-require 'pry-remote'
 
 require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
 require 'thread'
 
-client = Pigato::Client.new('tcp://localhost:55555')
-client.start
+ts = []
 
-Process.daemon
+[0,1,2,3,4,5,6].each do |tid|
+  ts << Thread.new {
+    client = Pigato::Client.new('tcp://127.0.0.1:55555')
+    client.start
 
-client.start
-requests = 1000
-d1 = Time.now
-requests.times do |i|
-  begin
-    client.request('echo', 'Hello world1')
-  end
+    requests = 10000
+    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)"
+  }
+end
+
+ts.each do |to|
+  to.join
 end
-d2 = Time.now
-puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"

data/examples/echo_worker.rb

@@ -4,9 +4,24 @@ require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
 
-worker = Pigato::Worker.new('tcp://localhost:55555', 'echo')
+ts = []
 
-loop do
-  request = worker.recv 
-  worker.reply request
+[0, 1, 2, 3, 4, 5, 6].each do |tid|
+  ts << Thread.new {
+    worker = Pigato::Worker.new('tcp://127.0.0.1:55555', 'echo')
+    worker.start
+
+    loop do
+      request = worker.recv
+      if !request.nil?
+        worker.reply request
+      else
+        sleep 0.1
+      end
+    end
+  }
+end
+
+ts.each do |to|
+  to.join
 end

data/lib/pigato/base.rb

@@ -0,0 +1,88 @@
+class Pigato::Base
+
+  @@sockets = {}
+  @@mtxs = {}
+  @@mtx = Mutex.new
+
+  def init 
+    @iid = SecureRandom.uuid
+  end
+ 
+  def get_thread_id
+    tid = get_proc_id() + "#" + Thread.current.object_id.to_s
+    tid
+  end
+
+  def get_proc_id
+    pid = "#" + Process.pid.to_s
+    pid
+  end
+
+  def get_iid 
+    iid = get_thread_id + '#' + @iid
+    iid
+  end
+
+  def get_socket
+    socket = @@sockets[get_iid]
+    socket
+  end
+
+  def get_mtx
+    tid = get_thread_id
+
+    if @@mtxs[tid].nil?
+      @@mtxs[tid] = Mutex.new
+    end 
+
+    return @@mtxs[tid]
+  end
+
+  def sock_create
+    @@mtx.synchronize {
+      pid = get_proc_id()
+ 
+      ctx = ZMQ::context
+      if ctx == nil then
+        ctx = ZMQ::Context.new
+        ctx.linger = 0
+      end
+
+      socket = ctx.socket ZMQ::DEALER
+      socket.identity = SecureRandom.uuid
+      socket.connect @broker
+
+      if @conf[:timeout] then
+        socket.rcvtimeo = @conf[:timeout];
+      end
+
+      @@sockets[get_iid] = socket
+    }
+  end
+  
+  def sock_close
+    @@mtx.synchronize {
+      pid = get_proc_id()
+
+      iid = get_iid
+
+      socket = @@sockets[iid]
+      if socket
+        begin
+          socket.close
+        rescue
+        end
+        @@sockets.delete(iid)
+      end
+    }
+  end
+
+  def start
+    @active = 1
+  end
+
+  def stop
+    @active = 0
+  end
+
+end 

data/lib/pigato/client.rb

@@ -1,11 +1,13 @@
-require 'thread'
+require "#{File.dirname(__FILE__)}/base.rb"
 
-class Pigato::Client
+class Pigato::Client < Pigato::Base
+
+  @@mtx = Mutex.new
+  @@ctxs = {}
+  @@sockets = {}
 
   def initialize broker, conf = {}
     @broker = broker
-    @ctxs = {}
-    @sockets = {}
 
     @conf = {
       :autostart => false,
@@ -14,26 +16,18 @@ class Pigato::Client
 
     @conf.merge!(conf)
 
+    init
+    
     if @conf[:autostart]
       start
     end
   end
 
-  def get_proc_id
-    pid = "#" + Process.pid.to_s
-    pid
-  end
- 
-  def get_thread_id
-    tid = "#" + get_proc_id() + "#" + Thread.current.object_id.to_s
-    tid
-  end
- 
   def request service, request, opts = {}
-    return nil if @sockets[get_thread_id()] == nil 
-    
-    socket = @sockets[get_thread_id()]
+    iid = get_iid
+    return nil if @@sockets[iid] == nil
     
+    socket = @@sockets[iid]
     request = [Oj.dump(request), Oj.dump(opts)]
 
     rid = SecureRandom.uuid
@@ -56,8 +50,10 @@ class Pigato::Client
   end
 
   def _recv rid 
-    socket = @sockets[get_thread_id()]
+    iid = get_iid
+    socket = @@sockets[iid]
     socket.rcvtimeo = @conf[:timeout]
+    
     data = []
     d1 = Time.now
     msg = socket.recv_message()
@@ -74,35 +70,15 @@ class Pigato::Client
   end
   
   def start
-    reconnect_to_broker
-  end
-
-  def stop
-    tid = get_thread_id()
-    if @sockets[tid]
-      @sockets[tid].close
-      @sockets.delete(tid)
-    end
-
-    pid = get_proc_id()
-    if @ctxs[pid]
-      @ctxs[pid].destroy
-      @ctxs.delete(pid)
-    end
-  end
-
-  def reconnect_to_broker
     stop
-
-    ctx = ZMQ::Context.new
-    ctx.linger = 0
-    @ctxs[get_proc_id()] = ctx
-
-    socket = ctx.socket ZMQ::DEALER
-    socket.identity = SecureRandom.uuid
-    socket.connect @broker
-    @sockets[get_thread_id()] = socket
+    sock_create
+    super 
   rescue ZMQ::Error => e
     puts e
   end
+
+  def stop
+    sock_close
+    super 
+  end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.2.27"
+  VERSION = "0.3.0"
 end

data/lib/pigato/worker.rb

@@ -1,35 +1,54 @@
-class Pigato::Worker
+require "#{File.dirname(__FILE__)}/base.rb"
+
+class Pigato::Worker < Pigato::Base
 
   HEARTBEAT_LIVENESS = 3 # 3-5 is reasonable
 
-  def initialize broker, service
+  def initialize broker, service, conf = {}
     @broker = broker
     @service = service
-    @heartbeat_at = 0 # When to send HEARTBEAT (relative to time.time(), so in seconds)
-    @liveness = 0 # How many attempts left
-    @timeout = 2500
-    @heartbeat = 2500 # Heartbeat delay, msecs
-    @reconnect = 2500 # Reconnect delay, msecs
 
+    @conf = {
+      :autostart => false,
+      :timeout => 2500,
+      :heartbeat => 2500,
+      :reconnect => 2500
+    }
+    
+    @conf.merge!(conf)
+
+    @liveness = 0
+    @heartbeat_at = 0
     @reply_to = nil
     @reply_rid = nil
     @reply_service = nil
+    
+    init
 
-    reconnect_to_broker
+    if @conf[:autostart]
+      start
+    end
   end
   
   def reply reply
     reply = [@reply_to, '', @reply_rid, '0'].concat([Oj.dump(reply)])
-    send_to_broker Pigato::W_REPLY, reply
+    send Pigato::W_REPLY, reply
   end
 
   def recv
+
     loop do
+
+      iid = get_iid
+
+      socket = get_socket 
+      return nil if socket.nil? 
+
       @reply_rid = nil
       @reply_to = nil
       @reply_service = nil
 
-      msg = @socket.recv_message 
+      msg = socket.recv_message 
 
       if msg && msg.size 
         @liveness = HEARTBEAT_LIVENESS
@@ -55,54 +74,51 @@ class Pigato::Worker
         when Pigato::W_HEARTBEAT
           # do nothing
         when Pigato::W_DISCONNECT
-          reconnect_to_broker
+          start
         else
         end
       else
         @liveness -= 1
         if @liveness == 0
-          sleep 0.001*@reconnect
-          reconnect_to_broker
+          sleep 0.001 * @conf[:reconnect]
+          start
         end
       end
 
       if Time.now > @heartbeat_at
-        send_to_broker Pigato::W_HEARTBEAT
-        @heartbeat_at = Time.now + 0.001 * @heartbeat
+        send Pigato::W_HEARTBEAT
+        @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
       end
 
     end
   end
 
-  def reconnect_to_broker
-    if @socket
-      @socket.close
-    end
-    if @ctx
-      @ctx.destroy
-    end
-
-    @ctx = ZMQ::Context.new
-    @socket = @ctx.socket ZMQ::DEALER
-    @ctx.linger = 0
-    @socket.identity = SecureRandom.uuid
-    @socket.connect @broker
-    @socket.rcvtimeo = @timeout;
-    send_to_broker Pigato::W_READY, @service
+  def start 
+    stop
+    sock_create
+    send Pigato::W_READY, @service
+    super
     @liveness = HEARTBEAT_LIVENESS
-    @heartbeat_at = Time.now + 0.001 * @heartbeat
+    @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
   end
 
-  def send_to_broker command, data = nil
+  def stop
+    sock_close
+    super
+  end
+
+  def send command, data = nil
     if data.nil?
       data = []
     elsif not data.is_a?(Array)
       data = [data]
     end
 
+    socket = get_socket
+
     data = [Pigato::W_WORKER, command].concat data
     msg = ZMQ::Message.new
     data.reverse.each{|p| msg.push(ZMQ::Frame(p))}
-    @socket.send_message msg
+    socket.send_message msg
   end
 end

data/lib/pigato.rb

@@ -5,3 +5,5 @@ require_relative 'pigato/version.rb'
 require_relative 'pigato/proto.rb'
 require_relative 'pigato/client.rb'
 require_relative 'pigato/worker.rb'
+
+require 'thread'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.3.0
 platform: ruby
 authors:
 - Paolo Ardoino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - examples/echo_client.rb
 - examples/echo_worker.rb
 - lib/pigato.rb
+- lib/pigato/base.rb
 - lib/pigato/client.rb
 - lib/pigato/proto.rb
 - lib/pigato/version.rb