drbqs 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/drbqs-manage

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'drbqs'
+require 'optparse'
+
+Version = '0.0.1'
+
+help_message =<<HELP
+Usage: #{File.basename(__FILE__)} <command> <uri>
+Manage DRbQS server by sending messages.
+<command> is 'exit-signal'.
+
+HELP
+
+begin
+  OptionParser.new(help_message) do |opt|
+    opt.on('--debug', 'Set $DEBUG true.') do |v|
+      $DEBUG = true
+    end
+    opt.parse!(ARGV)
+  end
+rescue OptionParser::InvalidOption
+  $stderr.print <<MES
+error: Invalid Option
+#{help_message}
+MES
+  exit(2)
+rescue OptionParser::InvalidArgument
+  $stderr.print <<MES
+error: Invalid Argument
+#{help_message}
+MES
+  exit(2)
+end
+
+if ARGV.size != 2
+  raise "Invalid arguments number. Please refer '#{File.basename(__FILE__)} -h'."
+end
+
+command = ARGV[0]
+uri = ARGV[1]
+
+manage = DRbQS::Manage.new(uri)
+
+case command
+when 'exit-signal'
+  manage.send_exit_signal
+else
+  raise "Invalid command: #{command}"
+end

data/bin/drbqs-node

@@ -6,7 +6,9 @@ require 'optparse'
 Version = '0.0.1'
 
 help_message =<<HELP
-#{File.basename(__FILE__)} [uri] [process_number]
+Usage: #{File.basename(__FILE__)} [<uri>] [<process_number>] [options ...]
+Start DRbQS nodes connecting to <uri>.
+
 HELP
 
 LOG_PREFIX_DEFAULT = 'drbqs_node'
@@ -37,6 +39,9 @@ begin
     opt.on('--log-stdout', 'Use stdout for outputting logs. This option cancels --log-prefix.') do |v|
       options[:log_prefix] = nil
     end
+    opt.on('--debug', 'Set $DEBUG true.') do |v|
+      $DEBUG = true
+    end
     opt.parse!(ARGV)
   end
 rescue OptionParser::InvalidOption

data/bin/drbqs-server

@@ -6,13 +6,24 @@ require 'optparse'
 Version = '0.0.1'
 
 help_message =<<HELP
-#{File.basename(__FILE__)} server_definition.rb [other files ...]
+Usage: #{File.basename(__FILE__)} <definition.rb> [other files ...] [options ...]
+       #{File.basename(__FILE__)} <definition.rb> [other files ...] [options ...] -- [server options ...]
+Start DRbQS server of definition files.
+
 HELP
 
 options = {
   :log_file => STDOUT
 }
 
+if n = ARGV.index('--')
+  command_argv = ARGV[0..(n - 1)]
+  server_argv = ARGV[(n + 1)..-1]
+else
+  command_argv = ARGV
+  server_argv = []
+end
+
 begin
   OptionParser.new(help_message) do |opt|
     opt.on('-p PORT', '--port', Integer, 'Set the port number of server.') do |v|
@@ -32,7 +43,10 @@ begin
         raise "Invalid log level."
       end
     end
-    opt.parse!(ARGV)
+    opt.on('--debug', 'Set $DEBUG true.') do |v|
+      $DEBUG = true
+    end
+    opt.parse!(command_argv)
   end
 rescue OptionParser::InvalidOption
   $stderr.print <<MES
@@ -48,13 +62,14 @@ MES
   exit(2)
 end
 
-if ARGV.size == 0 || !File.exist?(ARGV[0])
+if command_argv.size == 0 || !File.exist?(command_argv[0])
   raise "Invalid arguments. Please refer '#{File.basename(__FILE__)} -h'."
 end
 
-ARGV.each do |path|
+command_argv.each do |path|
   puts "load #{path}"
   load path
 end
 
+DRbQS.parse_option(server_argv)
 DRbQS.start_server(options)

data/drbqs.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbqs}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-05}
   s.description = %q{Task queuing system over network that is implemented by dRuby.}
   s.email = %q{d@ytak.info}
-  s.executables = ["drbqs-node", "drbqs-server"]
+  s.executables = ["drbqs-manage", "drbqs-node", "drbqs-server"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -25,13 +25,21 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/drbqs-manage",
     "bin/drbqs-node",
     "bin/drbqs-server",
     "drbqs.gemspec",
+    "example/README.md",
+    "example/drbqs-manage-test.rb",
+    "example/drbqs-node-test.rb",
+    "example/drbqs-server-test.rb",
+    "example/sum/server_def.rb",
+    "example/sum/sum.rb",
     "lib/drbqs.rb",
     "lib/drbqs/acl_file.rb",
     "lib/drbqs/client.rb",
     "lib/drbqs/connection.rb",
+    "lib/drbqs/manage.rb",
     "lib/drbqs/message.rb",
     "lib/drbqs/queue.rb",
     "lib/drbqs/server.rb",

data/example/README.md

@@ -0,0 +1,11 @@
+# Examples
+
+## Usage
+
+We execute server by the following command:
+
+    ruby drbqs-server-test.rb sum/server_def.rb
+
+For nodes we type the following command:
+
+    ruby drbqs-client-test.rb -l sum/sum.rb --log-stdout

data/example/drbqs-manage-test.rb

@@ -0,0 +1,3 @@
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
+
+load(File.dirname(__FILE__) + '/../bin/drbqs-manage')

data/example/drbqs-node-test.rb

@@ -0,0 +1,3 @@
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
+
+load(File.dirname(__FILE__) + '/../bin/drbqs-node')

data/example/drbqs-server-test.rb

@@ -0,0 +1,3 @@
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
+
+load(File.dirname(__FILE__) + '/../bin/drbqs-server')

data/example/sum/server_def.rb

@@ -0,0 +1,27 @@
+# 
+# Usage:
+#  drbqs-server server_def.rb -- 30 50
+#  drbqs-server server_def.rb -- 100 500 --step 100
+# 
+
+require_relative 'sum.rb'
+
+DRbQS.option_parser do |opt, hash|
+  opt.on('--step NUM', Integer) do |v|
+    hash[:step] = v
+  end
+end
+
+DRbQS.define_server do |server, argv, opts|
+  start_num = (argv[0] || 10).to_i
+  end_num = (argv[1] || 100).to_i
+  step_num = opts[:step] || 10
+  start_num.step(end_num, step_num) do |i|
+    task = DRbQS::Task.new(Sum.new(i - 10, i), :exec)
+    server.queue.add(task)
+  end
+
+  server.set_finish_hook do |serv|
+    serv.exit
+  end
+end

data/example/sum/sum.rb

@@ -0,0 +1,9 @@
+class Sum
+  def initialize(start_num, end_num)
+    @num = [start_num, end_num]
+  end
+
+  def exec
+    (@num[0]..@num[1]).inject(0) { |sum, i| sum += i }
+  end
+end

data/lib/drbqs/connection.rb

@@ -19,6 +19,8 @@ module DRbQS
       s = create_id_string
       @message.write([:connect, s])
       @id = @message.take([s, Fixnum])[1]
+      @logger.info("Get node id: #{@id}") if @logger
+      @id
     end
 
     def get_initialization
@@ -36,7 +38,9 @@ module DRbQS
         case sym
         when :alive_p
           @message.write([:alive, @id])
+          @logger.info("Send alive signal of node id #{@id}") if @logger
         when :exit
+          @logger.info("Get exit signal") if @logger
           Kernel.exit
         end
       rescue Rinda::RequestExpiredError

data/lib/drbqs/manage.rb

@@ -0,0 +1,15 @@
+require 'socket'
+
+module DRbQS
+
+  class Manage
+    def initialize(access_uri)
+      @access_uri = access_uri
+    end
+
+    def send_exit_signal
+      obj = DRbObject.new_with_uri(@access_uri)
+      obj[:message].write([:exit_server, "Command of #{Socket.gethostname}"])
+    end
+  end
+end

data/lib/drbqs/message.rb

@@ -54,14 +54,17 @@ module DRbQS
     end
 
     def manage_message(mes, arg)
-      @logger.debug("Get message") { [mes, arg] } if @logger
+      @logger.info("Get message") { [mes, arg] } if @logger
       case mes
       when :connect
         a = [arg, @node_list.get_new_id(arg)]
-        @logger.debug("New node") { a } if @logger
+        @logger.info("New node") { a } if @logger
         @message.write(a)
       when :alive
         @node_list.set_alive(arg)
+      when :exit_server
+        @logger.info("Get exit message from #{arg.to_s}") if @logger
+        return :exit_server
       else
         puts "Invalid message from #{arg.to_s}"
       end

data/lib/drbqs/server.rb

@@ -67,7 +67,7 @@ module DRbQS
 
     def check_connection(force = nil)
       if force || @check_alive.significant_interval?
-        @logger.info("Check connection") if @logger
+        @logger.debug("Check connection") if @logger
         @message.check_connection
         @check_alive.set_checking
       end
@@ -118,13 +118,26 @@ module DRbQS
       Kernel.exit
     end
 
+    def set_signal_trap
+      Signal.trap(:TERM) do
+        self.exit
+      end
+    end
+
+    def check_message
+      if @message.get_message == :exit_server
+        self.exit
+      end
+    end
+    private :check_message
+
     def wait
       loop do
-        @message.get_message
+        check_message
         check_connection
         count_results = @queue.get_result
         exec_hook
-        @logger.info("Calculating tasks: #{@queue.calculating_task_number}") if @logger
+        @logger.debug("Calculating tasks: #{@queue.calculating_task_number}") if @logger
         if count_results <= 1
           sleep(WAIT_NEW_RESULT)
         end

data/lib/drbqs/server_define.rb

@@ -1,21 +1,71 @@
 module DRbQS
 
-  @@server_create = nil
+  class ServerDefinition
+    HELP_MESSAGE =<<HELP
+[Server specific options]
+  These options are separated by '--' from command options.
 
-  def self.define_server(&block)
-    if @@server_create
-      raise ArgumentError, "The server has already defined."
+HELP
+
+    def initialize
+      @server_create = nil
+      @option_parse = nil
+      @opts = {}
+      @argv = nil
+    end
+
+    def define_server(&block)
+      if @server_create
+        raise ArgumentError, "The server has already defined."
+      end
+      @server_create = block
+    end
+
+    def option_parser(&block)
+      if @option_parse
+        raise ArgumentError, "The options parser has already defined."
+      end
+      @option_parse = block
+    end
+
+    def parse_option(opt_argv)
+      if @option_parse
+        OptionParser.new(HELP_MESSAGE) do |opt|
+          @option_parse.call(opt, @opts)
+          opt.parse!(opt_argv)
+        end
+      end
+      @argv = opt_argv  
+    end
+
+    def start_server(options)
+      unless @server_create
+        raise "Can not get server definition."
+      end
+      server = DRbQS::Server.new(options)
+      @server_create.call(server, @argv, @opts)
+      # @server_create.call(server)
+      server.set_signal_trap
+      server.start
+      server.wait
     end
-    @@server_create = block
+  end
+
+  @@server_def = ServerDefinition.new
+
+  def self.define_server(&block)
+    @@server_def.define_server(&block)
+  end
+
+  def self.option_parser(&block)
+    @@server_def.option_parser(&block)
+  end
+
+  def self.parse_option(opt_argv)
+    @@server_def.parse_option(opt_argv)
   end
 
   def self.start_server(options)
-    unless @@server_create
-      raise "Can not get server definition."
-    end
-    server = DRbQS::Server.new(options)
-    @@server_create.call(server)
-    server.start
-    server.wait
+    @@server_def.start_server(options)
   end
 end

data/lib/drbqs.rb

@@ -11,6 +11,7 @@ require 'drbqs/server_define'
 module DRbQS
   autoload :Server, 'drbqs/server'
   autoload :Client, 'drbqs/client'
+  autoload :Manage, 'drbqs/manage'
 
   ROOT_DEFAULT_PORT = 13500
 end

metadata

@@ -2,7 +2,7 @@
 name: drbqs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +09:00
+date: 2011-03-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ dependencies:
 description: Task queuing system over network that is implemented by dRuby.
 email: d@ytak.info
 executables: 
+- drbqs-manage
 - drbqs-node
 - drbqs-server
 extensions: []
@@ -86,13 +87,21 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/drbqs-manage
 - bin/drbqs-node
 - bin/drbqs-server
 - drbqs.gemspec
+- example/README.md
+- example/drbqs-manage-test.rb
+- example/drbqs-node-test.rb
+- example/drbqs-server-test.rb
+- example/sum/server_def.rb
+- example/sum/sum.rb
 - lib/drbqs.rb
 - lib/drbqs/acl_file.rb
 - lib/drbqs/client.rb
 - lib/drbqs/connection.rb
+- lib/drbqs/manage.rb
 - lib/drbqs/message.rb
 - lib/drbqs/queue.rb
 - lib/drbqs/server.rb
@@ -117,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1097812397295030278
+      hash: 3980203744145532744
       segments: 
       - 0
       version: "0"