rgossip 0.1.8 → 0.1.9

data/lib/rgossip/client.rb

@@ -103,27 +103,40 @@ module RGossip
       @node_list.synchronize {
         @dead_list.synchronize {
           raise 'node is exist' if @node_list.any? {|i| i.address == address }
+
           node = Node.new(@node_list, @dead_list, address, nil, nil, self.method(:perform_callback))
           @node_list << node
-          node.start_timer if @running
 
           @dead_list.reject! do |i|
             i.address == address
           end
+
+          node.start_timer if @running
+
+          perform_callback([:add, address, nil, nil])
         }
       }
     end
 
     def delete_node(address)
+      address = name2addr(address)
       raise 'cannot delete own node' if @my_node.address == address
 
       @node_list.synchronize {
-        @node_list.reject! do |i|
-          if i.address == address
-            i.stop_timer
-            true
+        @dead_list.synchronize {
+          @node_list.reject! do |i|
+            if i.address == address
+              i.stop_timer
+              true
+            end
           end
-        end
+
+          @dead_list.reject! do |i|
+            i.address == address
+          end
+
+          perform_callback([:delete, address, nil, nil])
+        }
       }
     end
 

data/lib/rgossip/node.rb

@@ -34,7 +34,7 @@ module RGossip
           @dead_list << self
         }
 
-        @callback.call([:delete, address, timestamp, data]) if @callback
+        @callback.call([:delete, @address, @timestamp, @data]) if @callback
       end
     end
 

data/lib/rgossip/timer.rb

@@ -3,59 +3,47 @@ module RGossip
     def initialize(timeout, &block)
       @timeout = timeout
       @block = block
-      @mutex = Mutex.new
-      @reset = false
     end
 
     def start
-      @mutex.synchronize {
-        if_is_thread_alive? { @thread.kill }
-        @reset = false
+      @thread.kill if is_thread_alive?
+      @start_time = Time.now
 
-        @thread = Thread.start {
-          loop do
-            sleep @timeout
-
-            if @reset
-              @reset = false
-              retry
-            end
+      @thread = Thread.start(@start_time) {|start_time|
+        loop do
+          sleep @timeout
 
+          if @start_time == start_time
             @block.call
             break
+          elsif @start_time.nil?
+            break
+          else
+            start_time = @start_time
           end
-        }
+        end
       }
     end
 
     def reset
-      @mutex.synchronize {
-        if_is_thread_alive? do
-          begin
-            @reset = true
-            @thread.run
-          ensure
-            @reset = false
-          end
-        end
-      }
+      if is_thread_alive?
+        @start_time = Time.now
+        @thread.run
+      end
     rescue ThreadError
     end
 
     def stop
-      @mutex.synchronize {
-        if_is_thread_alive? do
-          @thread.kill
-        end
-      }
+      if is_thread_alive?
+        @start_time = nil
+        @thread.run
+      end
     rescue ThreadError
     end
 
     private
-    def if_is_thread_alive?
-      if @thread and @thread.alive?
-        yield
-      end
+    def is_thread_alive?
+      @thread and @thread.alive?
     end
   end # Timer
 end # RGossip

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgossip
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +09:00
-default_executable: 
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: msgpack
@@ -42,14 +41,13 @@ extra_rdoc_files: []
 
 files: 
 - README
-- lib/rgossip/client.rb
+- lib/rgossip/timer.rb
 - lib/rgossip/gossipper.rb
-- lib/rgossip/node.rb
-- lib/rgossip/nodes.rb
+- lib/rgossip/client.rb
 - lib/rgossip/receiver.rb
-- lib/rgossip/timer.rb
+- lib/rgossip/nodes.rb
+- lib/rgossip/node.rb
 - lib/rgossip.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/rgossip
 licenses: []
 
@@ -79,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.1
 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/