pione 0.3.0 → 0.3.1

data/lib/pione/command/pione-client.rb

@@ -309,8 +309,12 @@ module Pione
       end
 
       def execute_job_terminator
-        @job_terminator = Agent::JobTerminator.start(@tuple_space) do
-          terminate
+        @job_terminator = Agent::JobTerminator.start(@tuple_space) do |status|
+          if status.error?
+            abort("pione-client catched the error: %s" % status.exception.message)
+          else
+            terminate
+          end
         end
       end
 
@@ -402,6 +406,7 @@ module Pione
       terminate :process_job => :spawner_thread
       terminate :child_process, :module => CommonCommandAction
       terminate :process_job => :process_manager
+      terminate :process_job => :job_terminator
       terminate :process_job => :task_worker
       terminate :process_job => :input_generator
       terminate :process_job => :logger
@@ -415,11 +420,19 @@ module Pione
         @spawner_threads.list.each {|thread| thread.kill}
       end
 
-      # Terminate process manager
+      # Terminate process manager. Be careful that pione-client main thread
+      # waits to stop the process manager's chain thread, so agents pione-client
+      # has cannot terminate maybe. You need to terminate it after process
+      # manager terminated.
       def terminate_process_manager
         @process_manager.terminate if @process_manager
       end
 
+      # Terminate job terminator.
+      def terminate_job_terminator
+        @job_terminator.terminate if @job_terminator and not(@job_terminator.terminated?)
+      end
+
       # Terminate task worker agents.
       def terminate_task_worker
         if option[:stand_alone] and @task_workers

data/lib/pione/command/pione-command.rb

@@ -0,0 +1,45 @@
+module Pione
+  module Command
+    # PioneCommand is a facade command for PIONE's various functions.
+    class PioneCommand < BasicCommand
+      # subcommand table
+      @subcommand = {}
+
+      class << self
+        attr_reader :subcommand
+
+        # Add the subcommand.
+        def add_subcommand(name, command)
+          @subcommand[name] = command
+        end
+      end
+
+      #
+      # basic informations
+      #
+
+      option_parser_mode :order!
+      command_name "pione"
+      command_banner "PIONE is a rule-based workflow engine."
+
+      #
+      # options
+      #
+
+      #
+      # command lifecycle: execution phase
+      #
+
+      execute :subcommand
+
+      def execute_subcommand
+        name = @argv.first
+        if cmd = self.class.subcommand[name]
+          cmd.run(@argv.drop(1))
+        else
+          abort("no such subcommand: %s" % name)
+        end
+      end
+    end
+  end
+end

data/lib/pione/command/pione-compiler.rb

@@ -0,0 +1,39 @@
+module Pione
+  module Command
+    # PionePackage is a command body of "pione-package".
+    class PioneCompiler < BasicCommand
+      #
+      # basic informations
+      #
+
+      command_name "pione-compiler"
+      command_banner "pione-compiler translates from PNML to PIONE document."
+
+      #
+      # options
+      #
+
+      use_option :debug
+
+      #
+      # command lifecycle: execution phase
+      #
+
+      setup :source
+
+      def setup_source
+        @source = @argv.first
+      end
+
+      #
+      # command lifecycle: execution phase
+      #
+
+      execute :compile_to_pnml
+
+      def execute_compile_to_pnml
+        print Util::PNMLCompiler.new(Location[@source]).compile
+      end
+    end
+  end
+end

data/lib/pione/command/pione-log.rb

@@ -8,6 +8,7 @@ module Pione
 
       command_name "pione-log"
       command_banner "View and convert PIONE log."
+      PioneCommand.add_subcommand("log", self)
 
       #
       # options

data/lib/pione/command/pione-task-worker.rb

@@ -108,8 +108,12 @@ module Pione
 
       # Create a job terminator and setup the action.
       def setup_job_terminator
-        @job_terminator = Agent::JobTerminator.new(@tuple_space) do
-          terminate
+        @job_terminator = Agent::JobTerminator.new(@tuple_space) do |status|
+          if status.error?
+            abort("pione-task-worker catched the error: %s" % status.exception.message)
+          else
+            terminate
+          end
         end
       end
 

data/lib/pione/command/pione-val.rb

@@ -8,6 +8,7 @@ module Pione
 
       command_name "pione-val"
       command_banner "Get the evaluation result value of the PIONE expression."
+      PioneCommand.add_subcommand("val", self)
 
       #
       # options

data/lib/pione/front.rb

@@ -3,6 +3,7 @@ module Pione
   module Front; end
 end
 
+require 'pione/front/front-exception'
 require 'pione/front/basic-front'
 require 'pione/front/client-front'
 require 'pione/front/broker-front'

data/lib/pione/front/basic-front.rb

@@ -63,7 +63,7 @@ module Pione
           begin
             DRb.start_service(build_front_server_uri(enum.next), self, config)
           rescue StopIteration => e
-            raise FrontError.new(self, e)
+            raise
           rescue
             retry
           end

data/lib/pione/front/front-exception.rb

@@ -2,9 +2,13 @@ module Pione
   module Front
     # FrontError is raised when front server cannnot start.
     class FrontError < StandardError
+      def initialize(front, exception)
+        @front = front
+        @exception = exception
+      end
 
       def message
-        "You couldn't start front server(%s)." % self.class.name
+        "You couldn't start front server(%s): %s" % [@front.class.name, @exception.message]
       end
     end
 

data/lib/pione/global.rb

@@ -2,126 +2,11 @@ module Pione
   # Global is a table of global variables in PIONE system. It defines variable
   # names, initial values, and configuration conditions. You can set and get
   # value by calling item named method.
-  module Global
-    #
-    # variables
-    #
-
-    # these variables should be with prefix and postfix because of name colloision
-    @__names__ = Array.new           # variable names
-    @__configurable__ = Hash.new     # variable configurability
-    @__lazy_initializer__ = Hash.new # variable initializers
-    @__dependencies__ = Hash.new {|h, k| h[k] = []} # dependency table
-    @__updater__ = Hash.new          # updaters for computed item
-
-    class << self
-      # Define an internal item. The item cannot be configured by user.
-      def define_internal_item(name, initial_value=nil, &initializer)
-        define_item(name, false, initial_value, :initializer => initializer)
-      end
-
-      # Define an external item. The item can be configured by user.
-      def define_external_item(name, initial_value=nil, &initializer)
-        define_item(name, true, initial_value, :initializer => initializer)
-      end
-
-      # Define a computed item. The item cannote be configured by user.
-      def define_computed_item(name, dependencies, &updater)
-        define_item(name, false, nil, :dependencies => dependencies, :updater => updater)
-      end
-
-      # Get value of the variable.
-      def get(name)
-        val = instance_variable_get("@%s" % name)
-        if val.nil?
-          # call lazy initializer
-          if @__lazy_initializer__.has_key?(name)
-            set(name, @__lazy_initializer__[name].call)
-          end
-
-          # call initial updater
-          if @__updater__.has_key?(name)
-            update(name)
-          end
-
-          # get value
-          get(name)
-        else
-          return val
-        end
-      end
-
-      # Set value of the variable.
-      def set(name, val)
-        # set value
-        instance_variable_set("@%s" % name, val)
-
-        # update dependecies
-        @__dependencies__[name].each do |dependency|
-          update(dependency)
-        end
-      end
-
-      # Update the computed item.
-      def update(name)
-        set(name, @__updater__[name].call)
-      end
-
-      # Return true if the variable is configurable.
-      def configurable?(name)
-        @__configurable__[name]
-      end
-
-      # Return all variable names.
-      def all_names
-        @__names__
-      end
-
-      private
-
-      # Define a new global variable.
-      def define_item(name, configurable, initial_value=nil, option)
-        # setup informations
-        @__names__ << name
-        @__configurable__[name]= configurable
-        @__lazy_initializer__[name] = option[:initializer] if option[:initializer]
-        @__updater__[name] = option[:updater] if option[:updater]
-
-        # build dependency table for computed items
-        if option[:dependencies]
-          option[:dependencies].each do |dependency|
-            @__dependencies__[dependency] << name
-          end
-        end
-
-        # set reader and writer
-        define_variable_reader(name)
-        define_variable_writer(name)
-
-        # set initial value
-        unless initial_value.nil?
-          set(name, initial_value)
-        end
-      end
-
-      # Define reader method of the variable.
-      def define_variable_reader(name)
-        singleton_class.module_eval do |mod|
-          define_method(name) {get(name)}
-        end
-      end
-
-      # Define writer method of the variable.
-      def define_variable_writer(name)
-        singleton_class.module_eval do |mod|
-          define_method("set_%s" % name) {|val| set(name, val)}
-          define_method("%s=" % name) {|val| set(name, val)}
-        end
-      end
-    end
-  end
+  module Global; end
 end
 
+require 'pione/global/item'
+require 'pione/global/config'
 require 'pione/global/system-variable'
 require 'pione/global/path-variable'
 require 'pione/global/network-variable'

data/lib/pione/global/broker-variable.rb

@@ -1,20 +1,33 @@
 module Pione
   module Global
     # broker-front port range begin
-    define_external_item(:broker_front_port_range_begin, 41000)
+    define_external_item(:broker_front_port_range_begin) do |item|
+      item.desc = "start port number of broker front"
+      item.init = 41000
+    end
 
     # broker-front port range end
-    define_external_item(:broker_front_port_range_end, 41999)
+    define_external_item(:broker_front_port_range_end) do |item|
+      item.desc = "end port number of broker front"
+      item.init = 41099
+    end
 
     # broker-front port range
-    define_internal_item(:broker_front_port_range) do
-      Range.new(
-        Global.broker_front_port_range_begin,
-        Global.broker_front_port_range_end
-      )
+    define_computed_item(:broker_front_port_range, [:broker_front_port_range_begin, :broker_front_port_range_end]) do |item|
+      item.desc = "port range of broker front"
+      item.define_updater do
+        Range.new(
+          Global.broker_front_port_range_begin,
+          Global.broker_front_port_range_end
+        )
+      end
     end
 
     # balancer method
-    define_external_item(:broker_task_worker_balancer) {Agent::EasyTaskWorkerBalancer}
+    define_external_item(:broker_task_worker_balancer) do |item|
+      item.desc = "balancer method of task worker broker"
+      item.init = "Pione::Agent::EasyTaskWorkerBalancer"
+      item.define_updater {|val| eval(val)}
+    end
   end
 end

data/lib/pione/global/client-variable.rb

@@ -1,18 +1,26 @@
 module Pione
   module Global
     # This is a begin number of port range for client's front.
-    define_external_item(:client_front_port_range_begin, 40000)
+    define_external_item(:client_front_port_range_begin) do |item|
+      item.desc = "start port number of client front"
+      item.init = 40000
+    end
 
     # This is an end number of port range for client's front.
-    define_external_item(:client_front_port_range_end, 40099)
+    define_external_item(:client_front_port_range_end) do |item|
+      item.desc = "end port number of client front"
+      item.init = 40099
+    end
 
     # This is port range for client's front.
-    define_computed_item(:client_front_port_range,
-      [:client_front_port_range_begin, :client_front_port_range_end]) do
-      Range.new(
-        Global.client_front_port_range_begin,
-        Global.client_front_port_range_end
-      )
+    define_computed_item(:client_front_port_range, [:client_front_port_range_begin, :client_front_port_range_end]) do |item|
+      item.desc = "port range of broker front"
+      item.define_updater do
+        Range.new(
+          Global.client_front_port_range_begin,
+          Global.client_front_port_range_end
+        )
+      end
     end
   end
 end

data/lib/pione/{system → global}/config.rb

@@ -1,5 +1,5 @@
 module Pione
-  module System
+  module Global
     # Config is a class for setting PIONE system configuration.
     class Config
       # Load configuration and apply it to global settings.
@@ -23,7 +23,7 @@ module Pione
       def apply
         @table.each do |key, val|
           key = key.to_sym
-          if Global.all_names.include?(key) and Global.configurable?(key)
+          if Global.item[key] and Global.item[key].configurable?
             Global.set(key, val)
           else
             raise UnconfigurableVariableError.new(key)

data/lib/pione/global/global-exception.rb

@@ -0,0 +1,40 @@
+module Pione
+  module Global
+    class GlobalError < StandardError; end
+
+    # UnknownItem is raised when unknown global item is referred.
+    class UnknownItem < GlobalError
+      def initialize(name)
+        @name = name
+      end
+
+      def message
+        "item '%s' is unknown as global variables" % @name
+      end
+    end
+
+    # This exception class is raised when configuration file is in invalid format.
+    class InvalidConfigFile < GlobalError
+      # config file path
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+      end
+
+      def message
+        "invalid format configuration file: %s" % @path
+      end
+    end
+
+    class UnconfigurableVariableError < GlobalError
+      def initialize(name)
+        @name = name
+      end
+
+      def message
+        "global variable \"%s\" is unconfigurable." % @name
+      end
+    end
+  end
+end