Moved all custom errors into a single file and into the Concurrent module.

Author: jdantonio

lib/concurrent.rb

@@ -13,6 +13,7 @@
 require 'concurrent/dataflow'
 require 'concurrent/delay'
 require 'concurrent/dereferenceable'
+require 'concurrent/errors'
 require 'concurrent/exchanger'
 require 'concurrent/future'
 require 'concurrent/ivar'

lib/concurrent/actor/postable.rb

@@ -57,7 +57,7 @@ def post?(*message)
 
     def post!(seconds, *message)
       raise ArgumentError.new('empty message') if message.empty?
-      raise Concurrent::Runnable::LifecycleError unless ready?
+      raise Concurrent::LifecycleError unless ready?
       raise Concurrent::TimeoutError if seconds.to_f <= 0.0
       event = Event.new
       cback = Queue.new

lib/concurrent/async.rb

@@ -1,14 +1,13 @@
 require 'thread'
 require 'concurrent/configuration'
 require 'concurrent/delay'
+require 'concurrent/errors'
 require 'concurrent/ivar'
 require 'concurrent/future'
 require 'concurrent/executor/thread_pool_executor'
 
 module Concurrent
 
-  InitializationError = Class.new(StandardError)
-
   # A mixin module that provides simple asynchronous behavior to any standard
   # class/object or object. 
   #

lib/concurrent/configuration.rb

@@ -1,14 +1,12 @@
 require 'thread'
 require 'concurrent/delay'
+require 'concurrent/errors'
 require 'concurrent/executor/thread_pool_executor'
 require 'concurrent/executor/timer_set'
 require 'concurrent/utility/processor_count'
 
 module Concurrent
 
-  # An error class to be raised when errors occur during configuration.
-  ConfigurationError = Class.new(StandardError)
-
   # A gem-level configuration object.
   class Configuration
 
@@ -55,7 +53,7 @@ def global_timer_set
     #
     # @return [ThreadPoolExecutor] the new thread pool
     #
-    # @raise [ConfigurationError] if this thread pool has already been set
+    # @raise [Concurrent::ConfigurationError] if this thread pool has already been set
     def global_task_pool=(executor)
       @global_task_pool.reconfigure { executor } or
           raise ConfigurationError.new('global task pool was already set')
@@ -74,7 +72,7 @@ def global_task_pool=(executor)
     #
     # @return [ThreadPoolExecutor] the new thread pool
     #
-    # @raise [ConfigurationError] if this thread pool has already been set
+    # @raise [Concurrent::ConfigurationError] if this thread pool has already been set
     def global_operation_pool=(executor)
       @global_operation_pool.reconfigure { executor } or
           raise ConfigurationError.new('global operation pool was already set')

lib/concurrent/errors.rb

@@ -0,0 +1,34 @@
+module Concurrent
+
+  # Raised when a complex and atomic operation, such as a transaction,
+  # is aborted prior to completion.
+  AbortError = Class.new(StandardError)
+
+  # Raised when errors occur during configuration.
+  ConfigurationError = Class.new(StandardError)
+
+  # Raised when a lifecycle method (such as `stop`) is called in an improper
+  # sequence or when the object is in an inappropriate state.
+  LifecycleError = Class.new(StandardError)
+
+  # Raised when an object's methods are called when it has not been
+  # properly initialized.
+  InitializationError = Class.new(StandardError)
+
+  # Raised when an object with a start/stop lifecycle has been started an
+  # excessive number of times. Often used in conjunction with a restart
+  # policy or strategy.
+  MaxRestartFrequencyError = Class.new(StandardError)
+
+  # Raised when an attempt is made to modify an immutable object
+  # (such as an `IVar`) after its final state has been set.
+  MultipleAssignmentError = Class.new(StandardError)
+
+  # Raised by an `Executor` when it is unable to process a given task,
+  # possibly because of a reject policy or other internal error.
+  RejectedExecutionError = Class.new(StandardError)
+
+  # Raised when an operation times out.
+  TimeoutError = Class.new(StandardError)
+
+end

lib/concurrent/executor/executor.rb

@@ -1,11 +1,8 @@
+require 'concurrent/errors'
 require 'concurrent/atomic/event'
 
 module Concurrent
 
-  # An exception class raised when the maximum queue size is reached and the
-  # `overflow_policy` is set to `:abort`.
-  RejectedExecutionError = Class.new(StandardError)
-
   module Executor
 
     # Submit a task to the executor for asynchronous processing.

lib/concurrent/ivar.rb

@@ -1,5 +1,6 @@
 require 'thread'
 
+require 'concurrent/errors'
 require 'concurrent/obligation'
 require 'concurrent/observable'
 
@@ -22,10 +23,6 @@ module Concurrent
   #   ivar.set 2 # would now be an error
   class IVar
 
-    # Error that indicates that an `IVar` was set twice. Each `IVar` can only
-    # be set once - they are immutable.
-    MultipleAssignmentError = Class.new(StandardError)
-
     include Obligation
     include Observable
 
@@ -85,15 +82,15 @@ def add_observer(observer = nil, func = :update, &block)
     # Set the `IVar` to a value and wake or notify all threads waiting on it.
     #
     # @param [Object] value the value to store in the `IVar`
-    # @raise [MultipleAssignmentError] if the `IVar` has already been set or otherwise completed
+    # @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already been set or otherwise completed
     def set(value)
       complete(true, value, nil)
     end
 
     # Set the `IVar` to failed due to some error and wake or notify all threads waiting on it.
     #
     # @param [Object] reason for the failure
-    # @raise [MultipleAssignmentError] if the `IVar` has already been set or otherwise completed
+    # @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already been set or otherwise completed
     def fail(reason = StandardError.new)
       complete(false, nil, reason)
     end

lib/concurrent/runnable.rb

@@ -1,11 +1,11 @@
 require 'thread'
 
+require 'concurrent/errors'
+
 module Concurrent
 
   module Runnable
 
-    LifecycleError = Class.new(StandardError)
-
     class Context
       attr_reader :runner, :thread
       def initialize(runner)

lib/concurrent/supervisor.rb

@@ -1,5 +1,6 @@
 require 'thread'
 
+require 'concurrent/errors'
 require 'concurrent/runnable'
 
 module Concurrent
@@ -15,8 +16,6 @@ class Supervisor
     CHILD_TYPES = [:worker, :supervisor]
     CHILD_RESTART_OPTIONS = [:permanent, :transient, :temporary]
 
-    MaxRestartFrequencyError = Class.new(StandardError)
-
     WorkerContext = Struct.new(:worker, :type, :restart) do
       attr_accessor :thread
       attr_accessor :terminated

lib/concurrent/tvar.rb

@@ -1,5 +1,6 @@
 require 'set'
 
+require 'concurrent/errors'
 require 'concurrent/atomic/thread_local_var'
 
 module Concurrent
@@ -109,7 +110,7 @@ def atomically
 
           begin
             result = yield
-          rescue Transaction::AbortError => e
+          rescue Concurrent::AbortError => e
             transaction.abort
             result = Transaction::ABORTED
           rescue => e
@@ -138,7 +139,7 @@ def atomically
 
   # Abort a currently running transaction - see `Concurrent::atomically`.
   def abort_transaction
-    raise Transaction::AbortError.new
+    raise Concurrent::AbortError.new
   end
 
   module_function :atomically, :abort_transaction
@@ -154,8 +155,6 @@ class Transaction
     ReadLogEntry = Struct.new(:tvar, :version)
     UndoLogEntry = Struct.new(:tvar, :value)
 
-    AbortError = Class.new(StandardError)
-
     def initialize
       @write_set = Set.new
       @read_log = []