Renamed internal executor methods with 'ns_' convention.

Author: jdantonio

lib/concurrent/executor/abstract_executor_service.rb

@@ -62,7 +62,7 @@ def auto_terminate=(value)
       synchronize { self.ns_auto_terminate = value }
     end
 
-    protected
+    private
 
     # Handler which executes the `fallback_policy` once the queue size
     # reaches `max_queue`.
@@ -89,28 +89,26 @@ def handle_fallback(*args)
       end
     end
 
-    def execute(*args, &task)
+    def ns_execute(*args, &task)
       raise NotImplementedError
     end
 
-    # @!macro [attach] executor_service_method_shutdown_execution
+    # @!macro [attach] executor_service_method_ns_shutdown_execution
     #
     #   Callback method called when an orderly shutdown has completed.
     #   The default behavior is to signal all waiting threads.
-    def shutdown_execution
+    def ns_shutdown_execution
       # do nothing
     end
 
-    # @!macro [attach] executor_service_method_kill_execution
+    # @!macro [attach] executor_service_method_ns_kill_execution
     #
     #   Callback method called when the executor has been killed.
     #   The default behavior is to do nothing.
-    def kill_execution
+    def ns_kill_execution
       # do nothing
     end
 
-    protected
-
     def ns_auto_terminate?
       !!@auto_terminate
     end

lib/concurrent/executor/java_executor_service.rb

@@ -57,7 +57,7 @@ def kill
         end
       end
 
-      protected
+      private
 
       def ns_running?
         !(ns_shuttingdown? || ns_shutdown?)

lib/concurrent/executor/java_single_thread_executor.rb

@@ -17,7 +17,7 @@ def initialize(opts = {})
         super(opts)
       end
 
-      protected
+      private
 
       def ns_initialize(opts)
         @executor = java.util.concurrent.Executors.newSingleThreadExecutor

lib/concurrent/executor/java_thread_pool_executor.rb

@@ -87,7 +87,7 @@ def running?
         super && !@executor.isTerminating
       end
 
-      protected
+      private
 
       def ns_initialize(opts)
         min_length = opts.fetch(:min_threads, DEFAULT_MIN_POOL_SIZE).to_i

lib/concurrent/executor/ruby_executor_service.rb

@@ -19,7 +19,7 @@ def post(*args, &task)
       synchronize do
         # If the executor is shut down, reject this task
         return handle_fallback(*args, &task) unless running?
-        execute(*args, &task)
+        ns_execute(*args, &task)
         true
       end
     end
@@ -29,7 +29,7 @@ def shutdown
         break unless running?
         self.ns_auto_terminate = false
         stop_event.set
-        shutdown_execution
+        ns_shutdown_execution
       end
       true
     end
@@ -39,7 +39,7 @@ def kill
         break if shutdown?
         self.ns_auto_terminate = false
         stop_event.set
-        kill_execution
+        ns_kill_execution
         stopped_event.set
       end
       true
@@ -49,11 +49,11 @@ def wait_for_termination(timeout = nil)
       stopped_event.wait(timeout)
     end
 
-    protected
+    private
 
     attr_reader :stop_event, :stopped_event
 
-    def shutdown_execution
+    def ns_shutdown_execution
       stopped_event.set
     end
 

lib/concurrent/executor/ruby_single_thread_executor.rb

@@ -16,7 +16,7 @@ def initialize(opts = {})
       super
     end
 
-    protected
+    private
 
     def ns_initialize(opts)
       @queue = Queue.new
@@ -27,19 +27,19 @@ def ns_initialize(opts)
     end
 
     # @!visibility private
-    def execute(*args, &task)
+    def ns_execute(*args, &task)
       supervise
       @queue << [args, task]
     end
 
     # @!visibility private
-    def shutdown_execution
+    def ns_shutdown_execution
       @queue << :stop
       stopped_event.set unless alive?
     end
 
     # @!visibility private
-    def kill_execution
+    def ns_kill_execution
       @queue.clear
       @thread.kill if alive?
     end

lib/concurrent/executor/ruby_thread_pool_executor.rb

@@ -95,7 +95,7 @@ def worker_died(worker)
       synchronize { ns_worker_died worker }
     end
 
-    protected
+    private
 
     # @!visibility private
     def ns_initialize(opts)
@@ -142,8 +142,6 @@ def ns_execute(*args, &task)
       # raise unless @ready.empty? || @queue.empty? # assert
     end
 
-    alias_method :execute, :ns_execute
-
     # @!visibility private
     def ns_shutdown_execution
       if @pool.empty?
@@ -158,8 +156,6 @@ def ns_shutdown_execution
       # raise unless @ready.empty? || @queue.empty? # assert
     end
 
-    alias_method :shutdown_execution, :ns_shutdown_execution
-
     # @!visibility private
     def ns_kill_execution
       # TODO log out unprocessed tasks in queue
@@ -169,8 +165,6 @@ def ns_kill_execution
       @ready.clear
     end
 
-    alias_method :kill_execution, :ns_kill_execution
-
     # tries to assign task to a worker, tries to get one from @ready or to create new one
     # @return [true, false] if task is assigned to a worker
     #

lib/concurrent/executor/serialized_execution.rb

@@ -65,7 +65,7 @@ def posts(posts)
       true
     end
 
-    protected
+    private
 
     def ns_initialize
       @being_executed = false

lib/concurrent/executor/simple_executor_service.rb

@@ -89,7 +89,7 @@ def wait_for_termination(timeout = nil)
       @stopped.wait(timeout)
     end
 
-    protected
+    private
 
     def ns_initialize
       @running = Concurrent::AtomicBoolean.new(true)

lib/concurrent/executor/timer_set.rb

@@ -65,7 +65,7 @@ def kill
 
     private :<<
 
-    protected
+    private
 
     # Initialize the object.
     #
@@ -118,7 +118,7 @@ def remove_task(task)
     # `ExecutorServic` callback called during shutdown.
     #
     # @!visibility private
-    def shutdown_execution
+    def ns_shutdown_execution
       @queue.clear
       @timer_executor.kill
       stopped_event.set