Merge branch 'master' into actor-context

Author: jdantonio

lib/concurrent/java_thread_pool_executor.rb

@@ -102,6 +102,15 @@ def remaining_capacity
         @max_queue == 0 ? -1 : @executor.getQueue.remainingCapacity
       end
 
+      # This method is deprecated and will be removed soon.
+      # This method is supost to return the threads status, but Java API doesn't
+      # provide a way to get the thread status. So we return an empty Array instead.
+      def status
+        warn '[DEPRECATED] `status` is deprecated and will be removed soon.'
+        warn "Calls to `status` return an empty Array. Java ThreadPoolExecutor does not provide thread's status."
+        []
+      end
+
       # Is the thread pool running?
       #
       # @return [Boolean] +true+ when running, +false+ when shutting down or shutdown

lib/concurrent/ruby_thread_pool_executor.rb

@@ -90,6 +90,14 @@ def running?
       @mutex.synchronize { @state == :running }
     end
 
+    # Returns an array with the status of each thread in the pool
+    #
+    # This method is deprecated and will be removed soon.
+    def status
+      warn '[DEPRECATED] `status` is deprecated and will be removed soon.'
+      @mutex.synchronize { @pool.collect { |worker| worker.status } }
+    end
+    
     # Is the thread pool shutdown?
     #
     # @return [Boolean] +true+ when shutdown, +false+ when shutting down or running

lib/concurrent/ruby_thread_pool_worker.rb

@@ -25,6 +25,13 @@ def last_activity # :nodoc:
       @mutex.synchronize { @last_activity }
     end
 
+    def status
+      @mutex.synchronize do
+        return 'not running' if @thread.nil?
+        @thread.status
+      end
+    end
+
     # @!visibility private
     def kill # :nodoc:
       @mutex.synchronize do

spec/concurrent/cached_thread_pool_shared.rb

@@ -100,6 +100,14 @@
     end
   end
 
+  context '#status' do
+
+    it 'returns an array' do
+      subject.stub(:warn)
+      subject.status.should be_kind_of(Array)
+    end
+  end
+
   context '#idletime' do
 
     subject{ described_class.new(idletime: 42) }

spec/concurrent/fixed_thread_pool_shared.rb

@@ -94,6 +94,14 @@
     end
   end
 
+  context '#status' do
+
+    it 'returns an array' do
+      subject.stub(:warn)
+      subject.status.should be_kind_of(Array)
+    end
+  end
+
   context '#idletime' do
 
     it 'returns zero' do