rgossip 0.1.1 → 0.1.2

data/README

@@ -18,7 +18,7 @@ gem install rgossip
   require 'rgossip'
   
   #RGossip.debug = true
-  #RGossip.porting = 20870 # default: 100870(udp)
+  #RGossip.port = 20870 # default: 10870(udp)
   
   gossip = RGossip::Client.new ['10.150.174.161', '10.150.185.250', '10.150.174.30']
   # RGossip::Client#initialize(initial_nodes = [], address = nil,  data = nil)

data/lib/rgossip/client.rb

@@ -6,52 +6,62 @@ module RGossip
     attr_reader :dead_list
     attr_reader :my_node
 
-    def initialize(initial_nodes = [], address = nil,  data = nil)
+    def initialize(initial_nodes = [], address = nil,  data = nil, callback = nil)
       raise 'too large data' if data && data.length > RGossip.bufsiz
 
       @address = address || IPSocket.getaddress(Socket.gethostname)
 
       RGossip.log("Initialize Client: initial_nodes=#{initial_nodes.inspect} address: #{@address} data: #{data.inspect}")
 
+      @callback = callback
       @node_list = Nodes.new
       @dead_list = Nodes.new
-      @my_node = Node.new(@node_list, @dead_list, @address, data)
+
+      @my_node = Node.new(@node_list, @dead_list, @address, data, nil, self.method(:perform_callback))
       @my_node.update_timestamp
       @node_list << @my_node
 
       initial_nodes.uniq.each do |i|
-        @node_list << Node.new(@node_list, @dead_list, i, nil)
+        @node_list << Node.new(@node_list, @dead_list, name2addr(i), nil, nil, self.method(:perform_callback))
       end
+
+      @gossiper = Gossiper.new(@my_node, @node_list)
+      @receiver = Receiver.new(@my_node, @node_list, @dead_list, self.method(:perform_callback))
     end
 
     def start
       return if @running
-      RGossip.log("Start Client: address=#{@address}")
 
-      @gossiper = Gossiper.new(@my_node, @node_list)
-      @receiver = Receiver.new(@my_node, @node_list, @dead_list)
+      begin
+        RGossip.log("Start Client: address=#{@address}")
 
-      @node_list.each do |node|
-        if node.address != @my_node.address
-          node.start_timer
+        @node_list.each do |node|
+          if node.address != @my_node.address
+            node.start_timer
+          end
         end
-      end
 
-      @gossiper.start
-      @receiver.start
-      @running = true
+        @gossiper.start
+        @receiver.start
+      ensure
+        @running = true
+      end
     end
 
     def stop
       return unless @running
-      RGossip.log("Stop Client")
 
-      @gossiper.stop
-      @receiver.stop
-      @running = true
+      begin
+        RGossip.log("Stop Client")
 
-      @gossiper = nil
-      @receiver = nil
+        @gossiper.stop
+        @receiver.stop
+
+        @gossiper = nil
+        @receiver = nil
+      ensure
+        @running = true
+      end
     end
 
     def join
@@ -63,16 +73,36 @@ module RGossip
       !!@running
     end
 
+    def address
+      @my_node.address
+    end
+
+    def data
+      @node_list.synchronize {
+        @my_node.data
+      }
+    end
+
     def data=(v)
       @node_list.synchronize {
         @my_node.data = v
       }
     end
 
+    def callback=(v)
+      @node_list.synchronize {
+        @dead_list.synchronize {
+          @callback = v
+        }
+      }
+    end
+
     def add_node(address)
+      address = name2addr(address)
+
       @node_list.synchronize {
         raise 'node is exist' if @node_list.any? {|i| i.address == address }
-        @node_list << Node.new(@node_list, @dead_list, address, nil)
+        @node_list << Node.new(@node_list, @dead_list, address, nil, nil, self.method(:perform_callback))
       }
     end
 
@@ -99,5 +129,27 @@ module RGossip
         end
       }
     end
+
+    private
+    def name2addr(name)
+      if /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/ =~ name
+        name
+      else
+        IPSocket.getaddress(name)
+      end
+    end
+
+    def perform_callback(args)
+      return unless @callback
+
+      case @callback.arity
+      when 0
+        @callback.call
+      when 1
+        @callback.call(args)
+      else
+        @callback.call(*args)
+      end
+    end
   end # Client
 end # RGossip

data/lib/rgossip/gossipper.rb

@@ -7,18 +7,24 @@ module RGossip
     def initialize(my_node, node_list)
       @my_node = my_node
       @node_list = node_list
-      @running = true
     end
 
     def start
       RGossip.log("Start Gossiper: interval=#{@@interval}")
+      @running = true
 
       @thread = Thread.start {
         begin
           sock = UDPSocket.open
 
           while @running
-            @node_list.synchronize { gossip(sock) }
+            begin
+              @node_list.synchronize { gossip(sock) }
+            rescue Exception => e
+              raise e unless RGossip.error_handler
+              RGossip.error_handler.call(e)
+            end
+
             sleep(@@interval)
           end
         ensure
@@ -47,12 +53,7 @@ module RGossip
       RGossip.log("Gossip: destination=#{dest.address}")
 
       @node_list.serialize_to_chunks.each do |chunk|
-        begin
-          sock.send(chunk, 0, dest.address, RGossip.port)
-        rescue Exception => e
-          raise e unless RGossip.error_handler
-          RGossip.error_handler.call(e)
-        end
+        sock.send(chunk, 0, dest.address, RGossip.port)
       end
     end
   end # Gossiper

data/lib/rgossip/node.rb

@@ -3,17 +3,19 @@ module RGossip
     attr_reader :address
     attr_accessor :timestamp
     attr_accessor :data
+    attr_accessor :callback
 
     @@lifetime = 10
     def self.lifetime; @@lifetime; end
     def self.lifetime=(v); @@lifetime = v; end
 
-    def initialize(node_list, dead_list, address, data, timestamp = nil)
+    def initialize(node_list, dead_list, address, data, timestamp, callback = nil)
       @node_list = node_list
       @dead_list = dead_list
       @address = address
       @data = data
       @timestamp = timestamp || ""
+      @callback = callback
 
       @timer = Timer.new(@@lifetime) do
         RGossip.log("Timeout Node: address=#{@address}")
@@ -27,6 +29,8 @@ module RGossip
         @dead_list.synchronize {
           @dead_list << self
         }
+
+        @callback.call([:delete, address, timestamp, data]) if @callback
       end
     end
 
@@ -40,13 +44,13 @@ module RGossip
     end
 
     def start_timer
-      RGossip.log("Start Timer: address=#{@address}")
+      RGossip.log("Start Timer: address=#{@address} lifetime=#{@@lifetime}")
 
       @timer.start
     end
 
     def reset_timer
-      RGossip.log("Reset Timer: address=#{@address}")
+      RGossip.log("Reset Timer: address=#{@address} lifetime=#{@@lifetime}")
 
       @timer.reset
     end

data/lib/rgossip/receiver.rb

@@ -4,15 +4,18 @@ module RGossip
     def self.timeout; @@timeout; end
     def self.timeout=(v); @@timeout = v; end
 
-    def initialize(my_node, node_list, dead_list)
+    attr_accessor :callback
+
+    def initialize(my_node, node_list, dead_list, callback = nil)
       @my_node = my_node
       @node_list = node_list
       @dead_list = dead_list
-      @running = true
+      @callback = callback
     end
 
     def start
       RGossip.log("Start Receiver: port=#{RGossip.port}")
+      @running = true
 
       @thread = Thread.start {
         begin
@@ -70,25 +73,31 @@ module RGossip
             node.timestamp = timestamp
             node.data = data
             node.reset_timer
+
+            @callback.call([:update, address, timestamp, data]) if @callback
           end
         elsif (index = @dead_list.synchronize { @dead_list.index {|i| i.address == address } })
-          RGossip.log("Come back Node: address=#{address} timestamp=#{timestamp}")
-
           @dead_list.synchronize {
             node = @dead_list[index]
 
             if timestamp > node.timestamp
+              RGossip.log("Come back Node: address=#{address} timestamp=#{timestamp}")
+
               @dead_list.delete_at(index)
               @node_list << node
               node.start_timer
+
+              @callback.call([:comeback, address, timestamp, data]) if @callback
             end
           }
         else
           RGossip.log("Add Node: address=#{address} timestamp=#{timestamp}")
 
-          node = Node.new(@node_list, @dead_list, address, data, timestamp)
+          node = Node.new(@node_list, @dead_list, address, data, timestamp, @callback)
           @node_list << node
           node.start_timer
+
+          @callback.call([:add, address, timestamp, data]) if @callback
         end
       end
     end

data/lib/rgossip.rb

@@ -11,6 +11,8 @@ require 'rgossip/receiver'
 require 'rgossip/timer'
 
 module RGossip
+  DEFAULT_LOGGER = Logger.new($stderr)
+
   @@port = 10870
   def self.port; @@port; end
   def self.port=(v); @@port = v; end
@@ -23,7 +25,16 @@ module RGossip
   def self.allowance; @@allowance; end
   def self.allowance=(v); @@allowance = v; end
 
-  @@error_handler = lambda {|e| $stderr.puts((["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")) }
+  @@error_handler = lambda do |e|
+    message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+
+    if self.debug_logger
+      self.debug_logger.call(message)
+    else
+      $stderr.puts(message)
+    end
+  end
+
   def self.error_handler; @@error_handler; end
   def self.error_handler=(v); @@error_handler = v; end
 
@@ -31,7 +42,7 @@ module RGossip
   def self.debug; @@debug; end
   def self.debug=(v); @@debug = v; end
 
-  @@debug_logger = lambda {|message| $stderr.puts "[#{Time.now.strftime '%x %X'} ##{$$}] #{message}" }
+  @@debug_logger = lambda {|message| DEFAULT_LOGGER.debug(message) }
   def self.debug_logger; @@debug_logger; end
   def self.debug_logger=(v); @@debug_logger = v; end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgossip
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-22 00:00:00 Z
+date: 2011-05-23 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: msgpack
@@ -41,13 +42,14 @@ extra_rdoc_files: []
 
 files: 
 - README
-- lib/rgossip/timer.rb
-- lib/rgossip/gossipper.rb
 - lib/rgossip/client.rb
-- lib/rgossip/receiver.rb
-- lib/rgossip/nodes.rb
+- lib/rgossip/gossipper.rb
 - lib/rgossip/node.rb
+- lib/rgossip/nodes.rb
+- lib/rgossip/receiver.rb
+- lib/rgossip/timer.rb
 - lib/rgossip.rb
+has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/rgossip
 licenses: []
 
@@ -77,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Basic implementation of a gossip protocol. This is a porting of Java implementation. see http://code.google.com/p/gossip-protocol-java/