drbqs 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/drbqs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbqs}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-02-27}
   s.description = %q{Queuing system over network that is implemented by dRuby.}
   s.email = %q{d@ytak.info}
   s.extra_rdoc_files = [

data/lib/drbqs/client.rb

@@ -28,13 +28,15 @@ module DRbQS
       end
     end
 
+    WAIT_NEW_TASK = 1
+
     def calculate
       cn = Thread.new do
         loop do
           @task_client.add_new_task
           @connection.respond_alive_signal
           @task_client.send_result
-          sleep(1)
+          sleep(WAIT_NEW_TASK)
         end
       end
       exec = Thread.new do

data/lib/drbqs/connection.rb

@@ -25,7 +25,7 @@ module DRbQS
       begin
         ary = @message.read([:initialize, nil, Symbol, nil], 0)
         ary[1..-1]
-      rescue
+      rescue Rinda::RequestExpiredError
         nil
       end
     end
@@ -39,7 +39,7 @@ module DRbQS
         when :exit
           Kernel.exit
         end
-      rescue
+      rescue Rinda::RequestExpiredError
       end
     end
   end

data/lib/drbqs/message.rb

@@ -93,7 +93,7 @@ module DRbQS
     def set_initialization(task)
       begin
         @message.take([:initialize, nil, Symbol, nil], 0)
-      rescue
+      rescue Rinda::RequestExpiredError
       end
       @message.write(task.drb_args(:initialize))
     end

data/lib/drbqs/queue.rb

@@ -28,7 +28,7 @@ module DRbQS
       @result = result
       @task_id = 0
       @cache = {}
-      @calculating = {}
+      @calculating = Hash.new { |hash, key| hash[key] = Array.new }
       @logger = logger
     end
 
@@ -46,43 +46,63 @@ module DRbQS
     end
 
     def get_accept_signal
+      count = 0
       begin
-        sym, task_id, node_id = @result.take([:accept, Fixnum, Fixnum], 0)
-        @calculating[node_id] = task_id
-        @logger.info("Accept: task #{task_id} by node #{node_id}.") if @logger
-      rescue
+        loop do
+          sym, task_id, node_id = @result.take([:accept, Fixnum, Fixnum], 0)
+          count += 1
+          @calculating[node_id] << task_id
+          @logger.info("Accept: task #{task_id} by node #{node_id}.") if @logger
+        end
+      rescue Rinda::RequestExpiredError
+        @logger.debug("Accept: #{count} signals.") if @logger
       end
+      count
     end
 
     def requeue_for_deleted_node_id(deleted)
       deleted.each do |node_id|
-        if task_id = @calculating[node_id]
-          queue_task(task_id)
-          @calculating.delete(task_id)
+        if task_id_ary = @calculating[node_id]
+          task_id_ary.each { |task_id| queue_task(task_id) }
+          @calculating.delete(node_id)
         end
       end
     end
 
     def get_result
+      count = 0
       begin
         loop do
+          get_accept_signal
           sym, task_id, result = @result.take([:result, Fixnum, nil], 0)
-          @logger.info("Get: result of #{task_id}.") if @logger
-          @calculating.delete(task_id)
+          count += 1
+          if ary = @calculating.find { |k, v| v.include?(task_id) }
+            node_id = ary[0]
+            @calculating[node_id].delete(task_id)
+          else
+            node_id = nil
+          end
+          @logger.info("Get: result of #{task_id} from node #{node_id}.") if @logger
           task = @cache.delete(task_id)
           if hook = task.hook
             hook.call(self, result)
           end
         end
-      rescue
+      rescue Rinda::RequestExpiredError
+        @logger.debug("Get: #{count} results.") if @logger
       end
+      count
+    end
+
+    def calculating_task_number
+      @calculating.inject(0) { |s, key_val| s + key_val[1].size }
     end
 
     # If queue is empty, return true. Otherwise, false.
     # Even if there are calculating tasks,
     # the method can return true.
     def empty?
-      @cache.size - @calculating.size == 0
+      @cache.size - calculating_task_number == 0
     end
 
     # If there are no tasks in queue and calculating,
@@ -90,10 +110,6 @@ module DRbQS
     def finished?
       @cache.size == 0
     end
-
-    def calculating_task_number
-      @calculating.size
-    end
   end
 
 end

data/lib/drbqs/server.rb

@@ -87,6 +87,7 @@ module DRbQS
     private :exec_hook
 
     WAIT_NODE_EXIT = 3
+    WAIT_NEW_RESULT = 1
 
     def exit
       @message.send_exit
@@ -101,9 +102,12 @@ module DRbQS
       loop do
         @message.get_message
         check_connection
-        @queue.get_result
+        count_results = @queue.get_result
         exec_hook
-        sleep(1)
+        @logger.info("Calculating tasks: #{@queue.calculating_task_number}") if @logger
+        if count_results <= 1
+          sleep(WAIT_NEW_RESULT)
+        end
       end
     end
   end

data/lib/drbqs/task_client.rb

@@ -16,8 +16,9 @@ module DRbQS
           task_id, obj, method_sym, args = @queue.take([Fixnum, nil, Symbol, nil], 0)
           @calculating_task = task_id
           @task_queue.enq([obj, method_sym, args])
-          @result.write([:accept, task_id, @node_id])
-        rescue
+          @logger.info("Send accept signal: node #{@node_id} caluclating #{@calculating_task}") if @logger
+          @result.write([:accept, @calculating_task, @node_id])
+        rescue Rinda::RequestExpiredError
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: drbqs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 +09:00
+date: 2011-02-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2055221894709119612
+      hash: 1630307079048384788
       segments: 
       - 0
       version: "0"