rubysl-rinda 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569d3924674613e8ef815b980e434f1f9083948c
-  data.tar.gz: bd62bc505d9fe5770dd53c548898b07d3f3b7531
+  metadata.gz: c2507e6dc6b7aa120ba8b18eff4075268a27799f
+  data.tar.gz: 8c52201f4f499a4800524c544bf68e27b4453c14
 SHA512:
-  metadata.gz: a9e02962e23175532cd263856f609c326ba754321e2922e4f86ae364af4a478c9c85fdd47c4279b8f205893b225d2968f10a8ee16c2d66bb27243ba8ee1f072a
-  data.tar.gz: df2c144c6265a21fc8c64feefd49a08868229f91b4b15361efe9ec953c151517585210c51b14f14d73d7762c64e3c53e9d98b03f76a8029deb074e86d5609b69
+  metadata.gz: 450544d5bbf7343fce6771ffa4c4c6b5f9a3ba2e115e6e9c60dad78be1899c7ea2e5bf7826bef348fe9a64248e3f8fca620be0f8df017f5d23b0352295b8483e
+  data.tar.gz: 0d4a3223c481fe1cb842338199b5c5c927a1ee53247cb7396d5d90333a86fe8dbe07f40ab0b0e7ce12058e6028440a53b58bee7c394bd68a9efd7b3ea4813e39

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rinda.rb

@@ -0,0 +1 @@
+require "rubysl/rinda"

data/lib/rinda/ring.rb

@@ -19,7 +19,7 @@ module Rinda
   # 1. A RingServer begins listening on the broadcast UDP address.
   # 2. A RingFinger sends a UDP packet containing the DRb URI where it will
   #    listen for a reply.
-  # 3. The RingServer recieves the UDP packet and connects back to the
+  # 3. The RingServer receives the UDP packet and connects back to the
   #    provided DRb URI with the DRb service.
 
   class RingServer
@@ -43,24 +43,24 @@ module Rinda
 
     def write_service
       Thread.new do
-	loop do
-	  msg = @soc.recv(1024)
-	  do_write(msg)
-	end
+        loop do
+          msg = @soc.recv(1024)
+          do_write(msg)
+        end
       end
     end
-  
+
     ##
     # Extracts the response URI from +msg+ and adds it to TupleSpace where it
     # will be picked up by +reply_service+ for notification.
 
     def do_write(msg)
       Thread.new do
-	begin
-	  tuple, sec = Marshal.load(msg)
-	  @ts.write(tuple, sec)
-	rescue
-	end
+        begin
+          tuple, sec = Marshal.load(msg)
+          @ts.write(tuple, sec)
+        rescue
+        end
       end
     end
 
@@ -69,18 +69,18 @@ module Rinda
 
     def reply_service
       Thread.new do
-	loop do
-	  do_reply
-	end
+        loop do
+          do_reply
+        end
       end
     end
-    
+
     ##
     # Pulls lookup tuples out of the TupleSpace and sends their DRb object the
     # address of the local TupleSpace.
 
     def do_reply
-      tuple = @ts.take([:lookup_ring, nil])
+      tuple = @ts.take([:lookup_ring, DRbObject])
       Thread.new { tuple[1].call(@ts) rescue nil}
     rescue
     end
@@ -104,9 +104,9 @@ module Rinda
     # created RingFinger.
 
     def self.finger
-      unless @@finger 
-	@@finger = self.new
-	@@finger.lookup_ring_any
+      unless @@finger
+        @@finger = self.new
+        @@finger.lookup_ring_any
       end
       @@finger
     end
@@ -119,7 +119,7 @@ module Rinda
     end
 
     ##
-    # Contains all discoverd TupleSpaces except for the primary.
+    # Contains all discovered TupleSpaces except for the primary.
 
     def self.to_a
       finger.to_a
@@ -178,15 +178,15 @@ module Rinda
 
       msg = Marshal.dump([[:lookup_ring, DRbObject.new(block)], timeout])
       @broadcast_list.each do |it|
-	soc = UDPSocket.open
-	begin
-	  soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
-	  soc.send(msg, 0, it, @port)
-	rescue
-	  nil
-	ensure
-	  soc.close
-	end
+        soc = UDPSocket.open
+        begin
+          soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+          soc.send(msg, 0, it, @port)
+        rescue
+          nil
+        ensure
+          soc.close
+        end
       end
       sleep(timeout)
     end
@@ -198,18 +198,22 @@ module Rinda
     def lookup_ring_any(timeout=5)
       queue = Queue.new
 
-      th = Thread.new do
-	self.lookup_ring(timeout) do |ts|
-	  queue.push(ts)
-	end
-	queue.push(nil)
-	while it = queue.pop
-	  @rings.push(it)
-	end
+      Thread.new do
+        self.lookup_ring(timeout) do |ts|
+          queue.push(ts)
+        end
+        queue.push(nil)
       end
-      
+
       @primary = queue.pop
       raise('RingNotFound') if @primary.nil?
+
+      Thread.new do
+        while it = queue.pop
+          @rings.push(it)
+        end
+      end
+
       @primary
     end
 
@@ -252,19 +256,19 @@ if __FILE__ == $0
   when 's'
     require 'rinda/tuplespace'
     ts = Rinda::TupleSpace.new
-    place = Rinda::RingServer.new(ts)
+    Rinda::RingServer.new(ts)
     $stdin.gets
   when 'w'
     finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      ts.write([:hello, :world])
+    finger.lookup_ring do |ts2|
+      p ts2
+      ts2.write([:hello, :world])
     end
   when 'r'
     finger = Rinda::RingFinger.new(nil)
-    finger.lookup_ring do |ts|
-      p ts
-      p ts.take([nil, nil])
+    finger.lookup_ring do |ts2|
+      p ts2
+      p ts2.take([nil, nil])
     end
   end
 end

data/lib/rinda/tuplespace.rb

@@ -2,6 +2,8 @@ require 'monitor'
 require 'thread'
 require 'drb/drb'
 require 'rinda/rinda'
+require 'enumerator'
+require 'forwardable'
 
 module Rinda
 
@@ -71,14 +73,14 @@ module Rinda
     end
 
     ##
-    # Reset the expiry time according to +sec_or_renewer+.  
+    # Reset the expiry time according to +sec_or_renewer+.
     #
     # +nil+::    it is set to expire in the far future.
     # +false+::  it has expired.
     # Numeric::  it will expire in that many seconds.
     #
     # Otherwise the argument refers to some kind of renewer object
-    # which will reset its expiry time. 
+    # which will reset its expiry time.
 
     def renew(sec_or_renewer)
       sec, @renewer = get_renewer(sec_or_renewer)
@@ -166,7 +168,7 @@ module Rinda
     def match(tuple)
       @tuple.match(tuple)
     end
-    
+
     alias === match
 
     def make_tuple(ary) # :nodoc:
@@ -222,11 +224,11 @@ module Rinda
   #
   #   ts = Rinda::TupleSpace.new
   #   observer = ts.notify 'write', [nil]
-  #   
+  #
   #   Thread.start do
   #     observer.each { |t| p t }
   #   end
-  #   
+  #
   #   3.times { |i| ts.write [i] }
   #
   # Outputs:
@@ -274,7 +276,7 @@ module Rinda
         it = pop
         yield(it)
       end
-    rescue 
+    rescue
     ensure
       cancel
     end
@@ -286,45 +288,70 @@ module Rinda
   # of Tuplespace.
 
   class TupleBag
+    class TupleBin
+      extend Forwardable
+      def_delegators '@bin', :find_all, :delete_if, :each, :empty?
+
+      def initialize
+        @bin = []
+      end
+
+      def add(tuple)
+        @bin.push(tuple)
+      end
+
+      def delete(tuple)
+        idx = @bin.rindex(tuple)
+        @bin.delete_at(idx) if idx
+      end
+
+      def find
+        @bin.reverse_each do |x|
+          return x if yield(x)
+        end
+        nil
+      end
+    end
 
     def initialize # :nodoc:
       @hash = {}
+      @enum = enum_for(:each_entry)
     end
 
     ##
     # +true+ if the TupleBag to see if it has any expired entries.
 
     def has_expires?
-      @hash.each do |k, v|
-        v.each do |tuple|
-          return true if tuple.expires
-        end
+      @enum.find do |tuple|
+        tuple.expires
       end
-      false
     end
 
     ##
-    # Add +ary+ to the TupleBag.
+    # Add +tuple+ to the TupleBag.
 
-    def push(ary)
-      size = ary.size
-      @hash[size] ||= []
-      @hash[size].push(ary)
+    def push(tuple)
+      key = bin_key(tuple)
+      @hash[key] ||= TupleBin.new
+      @hash[key].add(tuple)
     end
 
     ##
-    # Removes +ary+ from the TupleBag.
+    # Removes +tuple+ from the TupleBag.
 
-    def delete(ary)
-      size = ary.size
-      @hash.fetch(size, []).delete(ary)
+    def delete(tuple)
+      key = bin_key(tuple)
+      bin = @hash[key]
+      return nil unless bin
+      bin.delete(tuple)
+      @hash.delete(key) if bin.empty?
+      tuple
     end
 
     ##
     # Finds all live tuples that match +template+.
-
     def find_all(template)
-      @hash.fetch(template.size, []).find_all do |tuple|
+      bin_for_find(template).find_all do |tuple|
         tuple.alive? && template.match(tuple)
       end
     end
@@ -333,7 +360,7 @@ module Rinda
     # Finds a live tuple that matches +template+.
 
     def find(template)
-      @hash.fetch(template.size, []).find do |tuple|
+      bin_for_find(template).find do |tuple|
         tuple.alive? && template.match(tuple)
       end
     end
@@ -343,7 +370,7 @@ module Rinda
     # +tuple+ and are alive.
 
     def find_all_template(tuple)
-      @hash.fetch(tuple.size, []).find_all do |template|
+      @enum.find_all do |template|
         template.alive? && template.match(tuple)
       end
     end
@@ -354,20 +381,39 @@ module Rinda
 
     def delete_unless_alive
       deleted = []
-      @hash.keys.each do |size|
-        ary = []
-        @hash[size].each do |tuple|
+      @hash.each do |key, bin|
+        bin.delete_if do |tuple|
           if tuple.alive?
-            ary.push(tuple)
+            false
           else
             deleted.push(tuple)
+            true
           end
         end
-        @hash[size] = ary
       end
       deleted
     end
 
+    private
+    def each_entry(&blk)
+      @hash.each do |k, v|
+        v.each(&blk)
+      end
+    end
+
+    def bin_key(tuple)
+      head = tuple[0]
+      if head.class == Symbol
+        return head
+      else
+        false
+      end
+    end
+
+    def bin_for_find(template)
+      key = bin_key(template)
+      key ? @hash.fetch(key, []) : @enum
+    end
   end
 
   ##
@@ -403,8 +449,7 @@ module Rinda
     # Adds +tuple+
 
     def write(tuple, sec=nil)
-      entry = TupleEntry.new(tuple, sec)
-      start_keeper
+      entry = create_entry(tuple, sec)
       synchronize do
         if entry.expired?
           @read_waiter.find_all_template(entry).each do |template|
@@ -414,6 +459,7 @@ module Rinda
           notify_event('delete', entry.value)
         else
           @bag.push(entry)
+          start_keeper if entry.expires
           @read_waiter.find_all_template(entry).each do |template|
             template.read(tuple)
           end
@@ -439,7 +485,6 @@ module Rinda
     def move(port, tuple, sec=nil)
       template = WaitTemplateEntry.new(self, tuple, sec)
       yield(template) if block_given?
-      start_keeper
       synchronize do
         entry = @bag.find(template)
         if entry
@@ -452,6 +497,7 @@ module Rinda
 
         begin
           @take_waiter.push(template)
+          start_keeper if template.expires
           while true
             raise RequestCanceledError if template.canceled?
             raise RequestExpiredError if template.expired?
@@ -476,7 +522,6 @@ module Rinda
     def read(tuple, sec=nil)
       template = WaitTemplateEntry.new(self, tuple, sec)
       yield(template) if block_given?
-      start_keeper
       synchronize do
         entry = @bag.find(template)
         return entry.value if entry
@@ -484,6 +529,7 @@ module Rinda
 
         begin
           @read_waiter.push(template)
+          start_keeper if template.expires
           template.wait
           raise RequestCanceledError if template.canceled?
           raise RequestExpiredError if template.expired?
@@ -529,6 +575,10 @@ module Rinda
 
     private
 
+    def create_entry(tuple, sec)
+      TupleEntry.new(tuple, sec)
+    end
+
     ##
     # Removes dead tuples.
 
@@ -566,9 +616,12 @@ module Rinda
     def start_keeper
       return if @keeper && @keeper.alive?
       @keeper = Thread.new do
-        while need_keeper?
-          keep_clean
+        while true
           sleep(@period)
+          synchronize do
+            break unless need_keeper?
+            keep_clean
+          end
         end
       end
     end

data/lib/rubysl/rinda.rb

@@ -1 +1,2 @@
+require "rubysl/rinda/rinda"
 require "rubysl/rinda/version"

data/lib/{rinda → rubysl/rinda}/rinda.rb

@@ -58,7 +58,7 @@ module Rinda
 
     ##
     # The number of elements in the tuple.
-    
+
     def size
       @tuple.size
     end
@@ -162,7 +162,7 @@ module Rinda
       end
       return true
     end
-    
+
     ##
     # Alias for #match.
 
@@ -171,7 +171,7 @@ module Rinda
     end
 
   end
-  
+
   ##
   # <i>Documentation?</i>
 
@@ -184,7 +184,7 @@ module Rinda
       @drb_uri = uri
       @drb_ref = ref
     end
-    
+
     ##
     # This DRbObjectTemplate matches +ro+ if the remote object's drburi and
     # drbref are the same.  +nil+ is used as a wildcard.
@@ -213,14 +213,14 @@ module Rinda
     def initialize(ts)
       @ts = ts
     end
-    
+
     ##
     # Adds +tuple+ to the proxied TupleSpace.  See TupleSpace#write.
 
     def write(tuple, sec=nil)
       @ts.write(tuple, sec)
     end
-    
+
     ##
     # Takes +tuple+ from the proxied TupleSpace.  See TupleSpace#take.
 
@@ -229,14 +229,14 @@ module Rinda
       @ts.move(DRbObject.new(port), tuple, sec, &block)
       port[0]
     end
-    
+
     ##
     # Reads +tuple+ from the proxied TupleSpace.  See TupleSpace#read.
 
     def read(tuple, sec=nil, &block)
       @ts.read(tuple, sec, &block)
     end
-    
+
     ##
     # Reads all tuples matching +tuple+ from the proxied TupleSpace.  See
     # TupleSpace#read_all.
@@ -244,7 +244,7 @@ module Rinda
     def read_all(tuple)
       @ts.read_all(tuple)
     end
-    
+
     ##
     # Registers for notifications of event +ev+ on the proxied TupleSpace.
     # See TupleSpace#notify

data/lib/rubysl/rinda/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Rinda
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-rinda.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-rinda
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library rinda.
 email:
 - brixen@gmail.com
@@ -79,10 +65,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/rinda/rinda.rb
+- lib/rinda.rb
 - lib/rinda/ring.rb
 - lib/rinda/tuplespace.rb
 - lib/rubysl/rinda.rb
+- lib/rubysl/rinda/rinda.rb
 - lib/rubysl/rinda/version.rb
 - rubysl-rinda.gemspec
 homepage: https://github.com/rubysl/rubysl-rinda