villein 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af36f01ce7087aedfc374cb6541e40bbb91a8321
-  data.tar.gz: 83612d9193d206eed0770bcee0fbba3ce773e258
+  metadata.gz: 934ae99723282b5d94afb59a6804a1e0b96c1879
+  data.tar.gz: d6adab4011f1e4041c606cde13d014eb04e9bef1
 SHA512:
-  metadata.gz: 40b1b349f00083a0e2a662c03f4e82a13d1d204f0a95e480197c58879fdf7f79a6d5ba8384b64072b7c84907f053623a021a4aaa371043630329868c19f3ff45
-  data.tar.gz: 43e8c0e97b37961345414d56b9544d3e93818ed2215ef0b39bebb904072f3c5e04fabb921e1b7793056df45bbdc955b6aac1784034b1247924c64c32e6983871
+  metadata.gz: deebc81c352d00408d4361809c4eb976ad6e45fb1275d77c2b10800c8bd9e869bce494411fab677eac50d39615b4fdcb655c278fbaa1b99c191cb2c14cd159bc
+  data.tar.gz: a82e4a59374c72dbe5eadf627ae1c8cfe0acdb12c63056ba23b734e9c00685316112be2ac3d905207a274b42125bf025ab784b69cd39fff45edd0c496589a562

data/lib/villein/agent.rb

@@ -29,6 +29,8 @@ module Villein
                    encrypt: nil, profile: nil, protocol: nil,
                    event_handlers: [], replay: nil,
                    tags: {}, tags_file: nil,
+                   async_query: true,
+                   parallel_events: false,
                    log_level: :info, log: File::NULL,
                    villein_handler: EVENT_HANDLER)
       @serf = serf
@@ -40,6 +42,7 @@ module Villein
       @encrypt, @profile, @protocol = encrypt, profile, protocol
       @custom_event_handlers, @replay = event_handlers, replay
       @initial_tags, @tags_file = tags, tags_file
+      @async_query, @parallel_events = async_query, parallel_events
       @log_level, @log = log_level, log
       @villein_handler = villein_handler
 
@@ -228,9 +231,15 @@ module Villein
       return if @event_listener_thread
 
       @event_listener_server = TCPServer.new('localhost', 0)
+      @event_queue = Queue.new
       @event_listener_thread = Thread.new do
         event_listener_loop
       end
+
+      @event_dispatcher_thread = Thread.new do
+        event_dispatcher_loop
+      end
+
     end
 
     def stop_listening_events
@@ -238,59 +247,105 @@ module Villein
         @event_listener_thread.kill
       end
 
+      if @event_listener_dispatcher && @event_listener_dispatcher.alive?
+        @event_listener_thread.kill
+      end
+
       if @event_listener_server && !@event_listener_server.closed?
         @event_listener_server.close
       end
 
       @event_listener_thread = nil
+      @event_listener_dispatcher = nil
+      @event_queue = nil
       @event_listener_server = nil
     end
 
     def event_listener_loop
-      loop do
-        Thread.new(@event_listener_server.accept) do |sock|
-          begin
-            buf, obuf = "", ""
-            loop do
-              socks, _, _ = IO.select([sock], nil, nil, 5)
-              break unless socks
-
-              socks[0].read_nonblock(2048, obuf)
-              buf << obuf
-              break if socks[0].eof?
-            end
+      while sock = @event_listener_server.accept
+        sock_delegated = false
+        begin
+          buf, obuf = "", ""
+          loop do
+            socks, _, _ = IO.select([sock], nil, nil, 5)
+            break unless socks
+
+            socks[0].read_nonblock(2048, obuf)
+            buf << obuf
+            break if socks[0].eof?
+          end
 
-            handle_event buf, sock
-          ensure
-            sock.close unless sock.closed?
+          event = parse_event(buf)
+          next unless event
+
+          # XXX:
+          if event.type == 'query'
+            if @async_query
+              sock_delegated = true
+              Thread.new(event, sock) do |ev, so|
+                handle_query ev, so
+              end
+            else
+              handle_query event, sock
+            end
+          else
+            if @parallel_events
+              Thread.new(event) do |ev|
+                handle_event event
+              end
+            else
+              @event_queue << event
+            end
           end
+        ensure
+          sock.close if !sock_delegated && !sock.closed?
         end
       end
     end
 
-    def handle_event(payload, sock)
+    def event_dispatcher_loop
+      while event = @event_queue.pop
+        handle_event event
+      end
+    end
+
+    def parse_event(payload)
       env_payload, input = payload.split(/\0\0/,2) # ['name=val', 'name=val', '', 'input']
 
       env = Hash[env_payload.split(/\0/).map do |line|
         line.split(/=/,2)
       end]
 
-      event = Event.new(env, payload: input)
+      Event.new(env, payload: input)
+    rescue JSON::ParserError
+      # do nothing
+      return nil
+    end
 
+    def handle_event(event)
       @event_received = true
+      call_hooks event.type.gsub(/-/, '_'), event
+      call_hooks 'event', event
+    rescue Exception => e
+      $stderr.puts "Exception during handling event: #{event.inspect}"
+      $stderr.puts "#{e.class}: #{e.message}"
+      $stderr.puts e.backtrace.map { |_| _.prepend("\t") }
+    end
 
+    def handle_query(event, sock)
+      @event_received = true
       call_hooks event.type.gsub(/-/, '_'), event
       call_hooks 'event', event
 
       if event.type == 'query' && @responders[event.query_name]
         sock.write(@responders[event.query_name].call(event))
       end
-    rescue JSON::ParserError
-      # do nothing
     rescue Exception => e
-      $stderr.puts "Exception during handling event: #{event.inspect}"
+      $stderr.puts "Exception during handling query: #{event.inspect}"
       $stderr.puts "#{e.class}: #{e.message}"
       $stderr.puts e.backtrace.map { |_| _.prepend("\t") }
+    ensure
+      sock.close unless sock.closed?
     end
 
     def hooks_for(name)

data/lib/villein/version.rb

@@ -1,3 +1,3 @@
 module Villein
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/perf/README.md

@@ -0,0 +1,18 @@
+## villein: tiny script for performance measuring
+
+open 2 shells and run:
+
+```
+$ ruby perf.rb
+```
+
+```
+$ serf agent &
+$ serf join localhost:17946
+```
+
+then:
+
+```
+$ ruby perf2.rb
+```

data/perf/perf.rb

@@ -0,0 +1,17 @@
+require 'villein'
+
+agent = Villein::Agent.new(node: 'perf', rpc_addr: '127.0.0.1:17373', bind: "127.0.0.1:17946", parallel_events: !!ARGV[0])
+
+agent.on_user_event do |event|
+  p event
+end
+
+agent.respond('myquery') do |event|
+  p event
+  Time.now.to_s
+end
+
+agent.auto_stop
+agent.start!
+
+sleep

data/perf/perf2.rb

@@ -0,0 +1,11 @@
+i = 0
+loop do
+  100.times do
+    spawn "serf", "event", "-coalesce=false", "foo", i.to_s, out: File::NULL, err: File::NULL
+    spawn "serf", "event", "-coalesce=false", "bar", i.to_s, out: File::NULL, err: File::NULL
+    p i
+    i += 1
+  end
+  sleep 2
+  Process.waitall
+end

data/spec/agent_spec.rb

@@ -76,6 +76,26 @@ describe Villein::Agent do
     expect(received2.type).to eq 'member-join'
   end
 
+  context "with parallel_events=true" do
+    subject(:agent) { described_class.new(rpc_addr: rpc_addr, bind: bind, parallel_events: false) }
+
+    it "can receive events" do
+      received1, received2 = nil, nil
+
+      agent.on_event { |e| received1 = e }
+      agent.on_member_join { |e| received2 = e }
+
+      agent.start!
+      20.times { break if received1; sleep 0.1 }
+      agent.stop!
+
+      expect(received1).to be_a(Villein::Event)
+      expect(received2).to be_a(Villein::Event)
+      expect(received1.type).to eq 'member-join'
+      expect(received2.type).to eq 'member-join'
+    end
+  end
+
   it "can respond to queries" do
     agent.respond("hey") do |e|
       expect(e).to be_a(Villein::Event)
@@ -88,7 +108,24 @@ describe Villein::Agent do
     agent.stop!
 
     expect(response["Responses"].values.first).to eq("hello")
+  end
+
+  context "with async_query=false" do
+    subject(:agent) { described_class.new(rpc_addr: rpc_addr, bind: bind, async_query: false) }
+
+    it "can respond to queries" do
+      agent.respond("hey") do |e|
+        expect(e).to be_a(Villein::Event)
+        "hello"
+      end
+
+      agent.start!
+      Thread.new { agent.wait_for_ready }.join(5)
+      response = agent.query("hey", '')
+      agent.stop!
 
+      expect(response["Responses"].values.first).to eq("hello")
+    end
   end
 
   it "can handle unexpected stop" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: villein
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -91,6 +91,9 @@ files:
 - lib/villein/tags.rb
 - lib/villein/version.rb
 - misc/villein-event-handler.rb
+- perf/README.md
+- perf/perf.rb
+- perf/perf2.rb
 - spec/agent_spec.rb
 - spec/client_spec.rb
 - spec/event_handler_spec.rb