archipelago 0.2.6 → 0.2.7

data/README

@@ -4,7 +4,7 @@ It consists of several different parts, that can be used standalone or in conjun
 
 == Dependencies:
 Archipelago::Hashish::BerkeleyHashishProvider:: ruby bdb: http://moulon.inra.fr/ruby/bdb.html
-Archipelago::Client::Base:: rbtree: in this same repository is a patched version, original code is at http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html
+Archipelago::Client::Base:: archipelago_rbtree, a patched and gemified version of the original at http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html
 
 == Sub packages:
 Archipelago::Disco:: A UDP multicast discovery service useful to find services in your network with a minimum of configuration.

data/lib/archipelago/client.rb

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require 'archipelago/disco'
-require 'rbtree'
+require 'archipelago_rbtree'
 
 module Archipelago
 
@@ -57,9 +57,8 @@ module Archipelago
         @initial_lookup_timeout = options[:initial_lookup_timeout] || INITIAL_LOOKUP_TIMEOUT
         @services = {}
         @service_descriptions.each do |name, description|
-          t = RBTree.new
-          t.extend(Archipelago::Current::ThreadedCollection)
-          @services[name] = t
+          @services[name] = Archipelago::Disco::ServiceLocker.new
+          @services[name].convert_to_tree!
         end
 
         start_service_updater
@@ -118,9 +117,10 @@ module Archipelago
             # more than on average once every MAXIMUM_SERVICE_UPDATE_INTERVAL, so that MAY make it worthwhile to do
             # the RBTree song and dance in here. Hopefully.
             #
-            @services[name] = @jockey.lookup(Archipelago::Disco::Query.new(description), timeout)
-            @services[name].convert_to_tree!
-            @services[name].validate! if validate
+            new_services = @jockey.lookup(Archipelago::Disco::Query.new(description), timeout)
+            new_services.convert_to_tree!
+            new_services.validate! if validate
+            @services[name] = new_services
           end
         end
       end

data/lib/archipelago/current.rb

@@ -33,6 +33,41 @@ module Archipelago
 
   module Current
 
+    class Queue
+      def initialize
+        @lock = Monitor.new
+        @flag = MonitorMixin::ConditionVariable.new(@lock)
+        @ary = []
+      end
+      def <<(e)
+        @lock.synchronize do
+          @ary << e
+          @flag.broadcast
+        end
+      end
+      def empty?(wait = false)
+        @lock.synchronize do
+          if wait
+            @flag.wait_until do
+              @ary.empty?
+            end unless @ary.empty?
+            return @ary.empty?
+          else
+            return @ary.empty?
+          end
+        end
+      end
+      def shift
+        @lock.synchronize do
+          @flag.wait_while do
+            @ary.empty?
+          end if @ary.empty?
+          @flag.broadcast
+          return @ary.shift
+        end
+      end
+    end
+
     #
     # Adds a few threaded methods to the normal ruby collections.
     #

data/lib/archipelago/disco.rb

@@ -25,6 +25,7 @@ require 'drb'
 require 'set'
 require 'digest/sha1'
 require 'forwardable'
+require 'archipelago_rbtree'
 
 module Archipelago
 
@@ -485,8 +486,8 @@ module Archipelago
         @local_services = ServiceLocker.new(:jockey => self)
         @subscribed_services = Set.new
 
-        @incoming = Queue.new
-        @outgoing = Queue.new
+        @incoming = Archipelago::Current::Queue.new
+        @outgoing = Archipelago::Current::Queue.new
 
         @new_service_semaphore = MonitorMixin::ConditionVariable.new(Archipelago::Current::Lock.new)
         @service_change_subscribers_by_event_type = {:found => {}, :lost => {}}
@@ -575,7 +576,7 @@ module Archipelago
       end
 
       #
-      # Stops all the threads and close all sockets in this instance.
+      # Stops all the threads and closes all sockets in this instance.
       #
       def stop!
         if @valid
@@ -586,16 +587,13 @@ module Archipelago
 
           @listener_thread.kill
           @unilistener_thread.kill
-          until @incoming.empty?
-            sleep(0.01)
-          end
+
+          @incoming.empty?(true)
+          @picker_thread.kill
           @listener.close
           @unilistener.close
-          @picker_thread.kill
 
-          until @outgoing.empty?
-            sleep(0.01)
-          end
+          @outgoing.empty?(true)
           @shouter_thread.kill
           @sender.close
           @unisender.close
@@ -725,7 +723,7 @@ module Archipelago
         @shouter_thread = Thread.new do
           loop do
             begin
-              recipient, data = @outgoing.pop
+              recipient, data = @outgoing.shift
               if recipient
                 address, port = recipient.split(/:/)
                 @unisender.send(Marshal.dump(data), 0, address, port.to_i)
@@ -788,7 +786,7 @@ module Archipelago
         @picker_thread = Thread.new do
           loop do
             begin
-              data = @incoming.pop
+              data = @incoming.shift
               if Archipelago::Disco::Query === data
                 @local_services.get_services(data).each do |service_id, service_data|
                   if @thrifty_replying

data/lib/archipelago/hashish.rb

@@ -17,7 +17,7 @@
 
 require 'archipelago/current'
 require 'bdb'
-require 'rbtree'
+require 'archipelago_rbtree'
 
 module Archipelago
 

data/tests/current_test.rb

@@ -19,6 +19,41 @@ end
 
 class CurrentTest < Test::Unit::TestCase
 
+  def test_queue
+    q = Archipelago::Current::Queue.new
+    assert(q.empty?)
+    t = true
+    Thread.new do
+      e = q.shift
+      t = false
+    end
+    Thread.pass
+    assert(t)
+    q << "blar"
+    Thread.pass
+    sleep(0.1)
+    assert(!t)
+    
+    q << "bunke"
+    assert(!q.empty?)
+    q.shift
+    assert(q.empty?)
+
+    assert(q.empty?)
+    q << "hehu"
+    assert(!q.empty?)
+    Thread.new do
+      q.empty?(true)
+      t = true
+    end
+    Thread.pass
+    assert(!t)
+    q.shift
+    Thread.pass
+    assert(t)
+    assert(q.empty?)
+  end
+
   def test_synchronized
     t = true
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: archipelago
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 date: 2007-05-14 00:00:00 +02:00
 summary: A set of tools for distributed computing in ruby.
 require_paths: 
@@ -29,7 +29,6 @@ post_install_message:
 authors: 
 - Martin Kihlgren
 files: 
-- lib/archipelago.rb
 - lib/archipelago/client.rb
 - lib/archipelago/current.rb
 - lib/archipelago/disco.rb
@@ -39,6 +38,7 @@ files:
 - lib/archipelago/sanitation.rb
 - lib/archipelago/tranny.rb
 - lib/archipelago/treasure.rb
+- lib/archipelago.rb
 - tests/current_benchmark.rb
 - tests/current_test.rb
 - tests/disco_benchmark.rb
@@ -81,5 +81,22 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: oneliner
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: archipelago_rbtree
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.7
+    version: